From f70535ac293cf38ce009ab797adadf990e5f8141 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期二, 29 三月 2022 10:08:18 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 b87067d..5f3d349 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -24,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
@@ -113,10 +114,10 @@
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- item.setType("1");
- 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)) {
@@ -139,17 +140,35 @@
@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("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
- item.setType("1");
- 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.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());
itemService.update(item,new EntityWrapper<Item>()
--
Gitblit v1.9.1