From 228baf7c1c851ee8eba6d4da1e3f459f4d6a98e0 Mon Sep 17 00:00:00 2001
From: whycq0520 <91384184@qq.com>
Date: 星期四, 24 三月 2022 14:11:31 +0800
Subject: [PATCH] # ycq

---
 src/main/java/zy/cloud/wms/manager/controller/ItemController.java |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 48 insertions(+), 3 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 a85c32d..b87067d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -11,6 +11,7 @@
 import com.core.common.DateUtils;
 import com.core.common.R;
 import com.core.exception.CoolException;
+import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import zy.cloud.wms.common.web.BaseController;
@@ -47,10 +48,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",true);
+//        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));
     }
@@ -68,6 +73,39 @@
         }
     }
 
+    @RequestMapping(value = "/item/list/chaoPirce")
+    @ManagerAuth
+    public R list1(@RequestParam(defaultValue = "1")Integer curr,
+                  @RequestParam(defaultValue = "10")Integer limit,
+                  @RequestParam(required = false)String orderByField,
+                  @RequestParam(required = false)String orderByType,
+                  @RequestParam Map<String, Object> param){
+        val id = param.get("id");
+        String uuid=null;
+        if(id!=null){
+            uuid = id.toString();
+        }
+        Page<Item> projectPlanPage = itemService.chaoPirce(toPage(curr,limit,param,Item.class),uuid);
+        return R.ok(projectPlanPage);
+    }
+
+    @RequestMapping(value = "/item/list/chaoTime")
+    @ManagerAuth
+    public R list2(@RequestParam(defaultValue = "1")Integer curr,
+                   @RequestParam(defaultValue = "10")Integer limit,
+                   @RequestParam(required = false)String orderByField,
+                   @RequestParam(required = false)String orderByType,
+                   @RequestParam Map<String, Object> param){
+        val id = param.get("id");
+        String uuid=null;
+        if(id!=null){
+            uuid = id.toString();
+        }
+
+        Page<Item> projectPlanPage = itemService.chaoTime(toPage(curr,limit,param,Item.class),uuid);
+        return R.ok(projectPlanPage);
+    }
+
     @RequestMapping(value = "/item/add/auth")
     @ManagerAuth
     public R add(Item item) {
@@ -75,7 +113,7 @@
         if (Cools.isEmpty(item)) {
             return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
         }
-
+        item.setType("1");
         if (!item.getType().equals("1")) {
             throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
         }
@@ -83,6 +121,9 @@
                 .eq("name", item.getName()));
         if (!Cools.isEmpty(name)) {
             throw new CoolException("涓嶅彲鏈夐噸澶嶉」鐩悕");
+        }
+        if (item.getRealMonth() < 0){
+            throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
         }
 
         item.setHostId(getHostId());
@@ -101,10 +142,14 @@
         if (Cools.isEmpty(item)) {
             return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
         }
-
+        item.setType("1");
         if (!item.getType().equals("1")) {
             throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
         }
+//        item.setRealMonth(1);
+//        if (item.getRealMonth() < 0){
+//            throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+//        }
         item.setUpdateBy(getUserId());
         item.setUpdateTime(new Date());
         itemService.update(item,new EntityWrapper<Item>()

--
Gitblit v1.9.1