From 36de27cf6c6010bd2c8a5d1e09f12fc49932f4a9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 14 一月 2022 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitblit/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index c8ee4df..8c21370 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -47,10 +47,11 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
+// allLike(Item,null,wrapper,param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- wrapper.orderBy("status",false);
+ wrapper.orderBy("status",true);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -107,7 +108,9 @@
}
item.setUpdateBy(getUserId());
item.setUpdateTime(new Date());
- itemService.updateById(item);
+ itemService.update(item,new EntityWrapper<Item>()
+ .eq("id",item.getId()));
+// itemService.updateById(item);
return R.ok();
}
@@ -115,20 +118,22 @@
@ManagerAuth
public R delete(@RequestParam("ids[]") String param){
+// if (param != null){
+// itemService.delete(new EntityWrapper<Item>()
+// .eq("id",param));
+// planService.delete(new EntityWrapper<ProjectPlan>()
+// .eq("item_id",param));
+// }
if (param != null){
- itemService.delete(new EntityWrapper<Item>()
- .eq("id",param));
- planService.delete(new EntityWrapper<ProjectPlan>()
- .eq("item_id",param));
+ String[] split = param.split(",");
+ for (String s : split) {
+ Item item = itemService.selectOne(new EntityWrapper<Item>()
+ .eq("id", s));
+ item.setStatus(2);
+ itemService.update(item,new EntityWrapper<Item>()
+ .eq("id",item.getId()));
+ }
}
-
-// List<Item> list = JSONArray.parseArray(param, Item.class);
-// if (Cools.isEmpty(list)){
-// return R.error();
-// }
-// for (Item entity : list){
-// itemService.delete(new EntityWrapper<>(entity));
-// }
return R.ok();
}
--
Gitblit v1.9.1