From 3778e2dd638f53db1ff2b61cbc2ce8a9f9a93f28 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 23 三月 2026 16:11:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index 58cae40..e094157 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -47,12 +47,13 @@
private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.like(column, val);
}
}
}
@@ -96,13 +97,26 @@
@RequestMapping(value = "/basWrkStatus/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
- List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
- if (Cools.isEmpty(list)){
+ public R delete(@RequestParam(value = "ids[]", required = false) Long[] ids,
+ @RequestParam(value = "param", required = false) String param){
+ List<Long> deleteIds = new ArrayList<>();
+ if (!Cools.isEmpty(ids)) {
+ deleteIds.addAll(Arrays.asList(ids));
+ } else if (!Cools.isEmpty(param)) {
+ List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
+ if (!Cools.isEmpty(list)) {
+ for (BasWrkStatus entity : list) {
+ if (!Cools.isEmpty(entity) && entity.getWrkSts() != null) {
+ deleteIds.add(entity.getWrkSts());
+ }
+ }
+ }
+ }
+ if (Cools.isEmpty(deleteIds)){
return R.error();
}
- for (BasWrkStatus entity : list){
- basWrkStatusService.remove(new QueryWrapper<>(entity));
+ for (Long id : deleteIds){
+ basWrkStatusService.removeById(id);
}
return R.ok();
}
--
Gitblit v1.9.1