From e411967d48ce92ade3abea8a1ec2dba66d7e5297 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 六月 2020 16:17:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 8 +++++---
src/main/webapp/views/basCrnStatus/basCrnStatus.html | 2 +-
src/main/webapp/static/js/basCrnStatus/basCrnStatus.js | 2 +-
src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html | 2 +-
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index 9962ec2..f7331c4 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -34,13 +34,15 @@
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
+ @RequestParam(required = false, defaultValue = "asc")String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("sts_no", true);
+ }
return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index dff9d30..fdc4a58 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -22,7 +22,7 @@
/**
* 宸ヤ綔浠ｅ彿
*/
- @ApiModelProperty(value= "宸ヤ綔浠ｅ彿")
+ @ApiModelProperty(value= "鐘舵�佷唬鍙�")
@TableId(value = "sts_no", type = IdType.INPUT)
@TableField("sts_no")
private String stsNo;
diff --git a/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js b/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
index 960ccb3..efb0c3f 100644
--- a/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
+++ b/src/main/webapp/static/js/basCrnStatus/basCrnStatus.js
@@ -20,7 +20,7 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'stsNo', align: 'center', sort:true ,title: '宸ヤ綔浠ｅ彿'}
+ ,{field: 'stsNo', align: 'center', sort:true ,title: '鐘舵�佷唬鍙�'}
,{field: 'stsDesc', align: 'center',title: '鐘舵�佹弿杩�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/views/basCrnStatus/basCrnStatus.html b/src/main/webapp/views/basCrnStatus/basCrnStatus.html
index b5e642e..409bf9b 100644
--- a/src/main/webapp/views/basCrnStatus/basCrnStatus.html
+++ b/src/main/webapp/views/basCrnStatus/basCrnStatus.html
@@ -15,7 +15,7 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <label class="layui-form-label">宸ヤ綔浠ｅ彿锛�</label>
+ <label class="layui-form-label">鐘舵�佷唬鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" type="text" name="sts_no" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
diff --git a/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html b/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html
index b4b4015..fd8fd45 100644
--- a/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html
+++ b/src/main/webapp/views/basCrnStatus/basCrnStatus_detail.html
@@ -24,7 +24,7 @@
</div>
-->
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label"><span class="not-null">*</span>宸ヤ綔浠ｅ彿锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>鐘舵�佷唬鍙凤細</label>
<div class="layui-input-inline">
<input id="stsNo" class="layui-input" type="text" onkeyup="check(this.id, 'basCrnStatus')">
</div>
--
Gitblit v1.9.1