From bbb54c1ab65d141219dfbf7efb2af086522667a0 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 10 一月 2022 16:59:09 +0800
Subject: [PATCH] 项目计划管理有些功能没实现

---
 src/main/java/zy/cloud/wms/manager/controller/ItemController.java |   66 ++++++++++++++++++++++++++++----
 1 files changed, 57 insertions(+), 9 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 61ae10b..5644309 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -13,8 +13,12 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.manager.entity.Cstmr;
 import zy.cloud.wms.manager.entity.Item;
+import zy.cloud.wms.manager.entity.ProjectType;
+import zy.cloud.wms.manager.service.CstmrService;
 import zy.cloud.wms.manager.service.ItemService;
+import zy.cloud.wms.manager.service.ProjectTypeService;
 
 import java.util.*;
 
@@ -23,6 +27,10 @@
 
     @Autowired
     private ItemService itemService;
+    @Autowired
+    private CstmrService cstmrService;
+    @Autowired
+    private ProjectTypeService projectTypeService;
 
     @RequestMapping(value = "/item/{id}/auth")
     @ManagerAuth
@@ -61,6 +69,25 @@
     @RequestMapping(value = "/item/add/auth")
     @ManagerAuth
     public R add(Item item) {
+
+        if (Cools.isEmpty(item)) {
+            return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
+        }
+        Cstmr user_code = cstmrService.selectOne(new EntityWrapper<Cstmr>()
+                .eq("user_code", item.getCstmrUuid()));
+        if (!Cools.isEmpty(user_code)) {
+            item.setCstmr(user_code.getName());
+        }else {
+            return R.error("鍙傛暟閿欒,璇疯緭鍏ユ纭殑瀹㈡埛缂栧彿");
+        }
+        ProjectType id = projectTypeService.selectOne(new EntityWrapper<ProjectType>()
+                .eq("id", item.getType()));
+        if (!Cools.isEmpty(id)) {
+            item.setType(id.getTypeName());
+        }else {
+            return R.error("鍙傛暟閿欒,鎵句笉鍒拌椤圭洰绫诲瀷");
+        }
+
         item.setHostId(getHostId());
         item.setCreateBy(getUserId());
         item.setCreateTime(new Date());
@@ -74,9 +101,26 @@
 	@RequestMapping(value = "/item/update/auth")
 	@ManagerAuth
     public R update(Item item){
-        if (Cools.isEmpty(item) || null==item.getUuid()){
-            return R.error();
+        if (Cools.isEmpty(item)) {
+            return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
         }
+        Cstmr user_code = cstmrService.selectOne(new EntityWrapper<Cstmr>()
+                .eq("user_code", item.getCstmrUuid()));
+        if (!Cools.isEmpty(user_code)) {
+            item.setCstmr(user_code.getName());
+        }else {
+            return R.error("鍙傛暟閿欒,璇疯緭鍏ユ纭殑瀹㈡埛缂栧彿");
+        }
+        ProjectType id = projectTypeService.selectOne(new EntityWrapper<ProjectType>()
+                .eq("id", item.getType()));
+        if (!Cools.isEmpty(id)) {
+            item.setType(id.getTypeName());
+        }else {
+            return R.error("鍙傛暟閿欒,鎵句笉鍒拌椤圭洰绫诲瀷");
+        }
+//        if (Cools.isEmpty(item) || null==item.getUuid()){
+//            return R.error();
+//        }
         item.setUpdateBy(getUserId());
         item.setUpdateTime(new Date());
         itemService.updateById(item);
@@ -85,14 +129,18 @@
 
     @RequestMapping(value = "/item/delete/auth")
     @ManagerAuth
-    public R delete(@RequestParam String param){
-        List<Item> list = JSONArray.parseArray(param, Item.class);
-        if (Cools.isEmpty(list)){
-            return R.error();
+    public R delete(@RequestParam("ids[]") String param){
+        if (param != null){
+            itemService.delete(new EntityWrapper<Item>()
+                    .eq("id",param));
         }
-        for (Item entity : list){
-            itemService.delete(new EntityWrapper<>(entity));
-        }
+//        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