From 0aa1c9d1a42e2ac5639228d23dfedbc03ded6fb5 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 30 三月 2022 16:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/java/zy/cloud/wms/manager/controller/ItemController.java |   74 ++++++++++++++++++++++++++++++++-----
 1 files changed, 64 insertions(+), 10 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 854eceb..5f3d349 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;
@@ -23,6 +24,7 @@
 import zy.cloud.wms.manager.service.ProjectPlanService;
 import zy.cloud.wms.manager.service.ProjectTypeService;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
@@ -49,7 +51,7 @@
         EntityWrapper<Item> wrapper = new EntityWrapper<>();
         HashSet<String> excludeField = new HashSet<>();
 
-//        allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
+        allLike(Item.class,excludeField,wrapper, (String) param.get("id"));
         excludeTrash(param);
         convert(param, wrapper);
         hostEq(wrapper);
@@ -72,6 +74,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) {
@@ -79,10 +114,10 @@
         if (Cools.isEmpty(item)) {
             return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
         }
-
-        if (!item.getType().equals("1")) {
-            throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
-        }
+        //item.setType("1");
+//        if (!item.getType().equals("1")) {
+//            throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+//        }
         Item name = itemService.selectOne(new EntityWrapper<Item>()
                 .eq("name", item.getName()));
         if (!Cools.isEmpty(name)) {
@@ -105,15 +140,34 @@
 	@RequestMapping(value = "/item/update/auth")
 	@ManagerAuth
     public R update(Item item){
+        EntityWrapper<Item> wapper = new EntityWrapper<Item>();
+        Item newitem = itemService.selectOne(wapper.eq("id", item.getId()));
         if (Cools.isEmpty(item)) {
             return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
         }
-
-        if (!item.getType().equals("1")) {
-            throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+//        item.setType("1");
+//        if (!item.getType().equals("1")) {
+//            throw new CoolException("鐩墠浠呮敮鎸侀泦鎴愰」鐩�");
+//        }
+//        item.setRealMonth(1);
+//        if (item.getRealMonth() < 0){
+//            throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+//        }
+        if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
+            item.setStartTime(newitem.getStartTime());
+            item.setEndTime(newitem.getEndTime());
+            item.setRealEndTime(newitem.getRealEndTime());
+            item.setRealStartTime(newitem.getRealStartTime());
         }
-        if (item.getRealMonth() < 0){
-            throw new CoolException("瀹炴柦鍛ㄦ湡涓嶅彲涓鸿礋鏁�");
+        //瓒呭嚭杩愯垂
+        if(item.getPlandeAmt()!=null && item.getRealdeAmt()!=null){
+            item.setExcessAmount(item.getRealdeAmt()-item.getPlandeAmt());
+        }
+        //瓒呭嚭澶╂暟
+        if(item.getRealinDate()!=null && item.getPlaninDate()!=null){
+            Double days = (double) ((item.getRealinDate().getTime() - item.getPlaninDate().getTime()) / (1000*3600*24));      
+            Integer day= (int) Math.ceil(days);
+            item.setExcessTime(day);
         }
         item.setUpdateBy(getUserId());
         item.setUpdateTime(new Date());

--
Gitblit v1.9.1