From 0dd23ce00979f8aa836b19e3c565094665d6fa47 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 17 一月 2022 14:33:02 +0800
Subject: [PATCH] 新增点击排序功能
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 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..854eceb 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,14 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
EntityWrapper<Item> wrapper = new EntityWrapper<>();
+ HashSet<String> excludeField = new HashSet<>();
+
+// allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- wrapper.orderBy("status",false);
+// wrapper.orderBy("status",true);
+ wrapper.orderBy("id",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -84,6 +88,9 @@
if (!Cools.isEmpty(name)) {
throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
}
+ if (item.getRealMonth() < 0){
+ throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+ }
item.setHostId(getHostId());
item.setCreateBy(getUserId());
@@ -105,9 +112,14 @@
if (!item.getType().equals("1")) {
throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
}
+ if (item.getRealMonth() < 0){
+ throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+ }
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 +127,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