From b1b7d4380a7ddcd379f6bd8b8e5bac116badc43a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 22 三月 2026 17:58:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 4929264..af4d55c 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -62,15 +62,16 @@
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 {
- if (entry.getKey().equals("loc_no") || entry.getKey().equals("row1") || entry.getKey().equals("bay1") || entry.getKey().equals("lev1")) {
- wrapper.eq(entry.getKey(), val);
+ if ("loc_no".equals(column) || "row1".equals(column) || "bay1".equals(column) || "lev1".equals(column)) {
+ wrapper.eq(column, val);
}else {
- wrapper.like(entry.getKey(), val);
+ wrapper.like(column, val);
}
}
}
@@ -95,13 +96,26 @@
@RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
- public R delete(@RequestParam String param){
- List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ public R delete(@RequestParam(value = "ids[]", required = false) String[] ids,
+ @RequestParam(value = "param", required = false) String param){
+ List<String> deleteIds = new ArrayList<>();
+ if (!Cools.isEmpty(ids)) {
+ deleteIds.addAll(Arrays.asList(ids));
+ } else if (!Cools.isEmpty(param)) {
+ List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
+ if (!Cools.isEmpty(list)) {
+ for (LocMast entity : list) {
+ if (!Cools.isEmpty(entity) && !Cools.isEmpty(entity.getLocNo())) {
+ deleteIds.add(entity.getLocNo());
+ }
+ }
+ }
+ }
+ if (Cools.isEmpty(deleteIds)){
return R.error();
}
- for (LocMast entity : list){
- locMastService.remove(new QueryWrapper<>(entity));
+ for (String id : deleteIds){
+ locMastService.removeById(id);
}
return R.ok();
}
--
Gitblit v1.9.1