From 59f80df1e377e8775969ca4acadfa2eadd6e37ae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 19:01:38 +0800
Subject: [PATCH] excel导出优化
---
src/main/java/com/zy/asrs/controller/WrkChargeController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..26eaac5 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();
@@ -138,5 +140,11 @@
return R.ok();
}
+ @RequestMapping(value = "/wrkCharge/truncate/reset/auth")
+ @ManagerAuth
+ public R truncateReset() {
+ wrkChargeService.delete(new EntityWrapper<WrkCharge>().eq("memo", "reset"));
+ return R.ok();
+ }
}
--
Gitblit v1.9.1