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/BasLocStsController.java | 23 +++++++++--
src/main/java/com/zy/asrs/controller/LocMastController.java | 23 +++++++++--
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 23 +++++++++--
3 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index e9d3eb1..b0bcde6 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -97,13 +97,26 @@
@RequestMapping(value = "/basLocSts/delete/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
- List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.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<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class);
+ if (!Cools.isEmpty(list)) {
+ for (BasLocSts entity : list) {
+ if (!Cools.isEmpty(entity) && !Cools.isEmpty(entity.getLocSts())) {
+ deleteIds.add(entity.getLocSts());
+ }
+ }
+ }
+ }
+ if (Cools.isEmpty(deleteIds)){
return R.error();
}
- for (BasLocSts entity : list){
- basLocStsService.remove(new QueryWrapper<>(entity));
+ for (String id : deleteIds){
+ basLocStsService.removeById(id);
}
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index 7aff1f9..e094157 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -97,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();
}
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 0cd5cd0..af4d55c 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -96,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