From 986d4d1d5c1cdf3d7d6ff292ad01669b4bfb018c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 十月 2022 13:09:18 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkCharge/wrkCharge.js | 5 +++--
src/main/java/com/zy/asrs/controller/WrkChargeController.java | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkChargeController.java b/src/main/java/com/zy/asrs/controller/WrkChargeController.java
index a11c4da..10777cc 100644
--- a/src/main/java/com/zy/asrs/controller/WrkChargeController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkChargeController.java
@@ -44,7 +44,9 @@
excludeTrash(param);
convert(param, wrapper);
allLike(WrkCharge.class, param.keySet(), wrapper, condition);
- 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("appe_time", false);
+ }
return R.ok(wrkChargeService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -80,8 +82,8 @@
@RequestMapping(value = "/wrkCharge/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value="ids[]") Integer[] ids){
+ for (Integer id : ids){
wrkChargeService.deleteById(id);
}
return R.ok();
diff --git a/src/main/webapp/static/js/wrkCharge/wrkCharge.js b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
index b1a7613..ccb6dc4 100644
--- a/src/main/webapp/static/js/wrkCharge/wrkCharge.js
+++ b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
@@ -148,7 +148,7 @@
return;
}
del(checkStatus.map(function (d) {
- return d.id;
+ return d.wrkNo;
}));
break;
case 'exportData':
@@ -200,7 +200,7 @@
showEditModel(data);
break;
case "del":
- del([data.id]);
+ del([data.wrkNo]);
break;
}
});
@@ -251,6 +251,7 @@
}, function (i) {
layer.close(i);
var loadIndex = layer.load(2);
+ console.log({ids: ids})
$.ajax({
url: baseUrl+"/wrkCharge/delete/auth",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1