From 643a7b479b5f309ae1014d9c1644586c1047cdd5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 16 九月 2022 10:51:30 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
index d604117..fac4b2b 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -118,8 +118,16 @@
return R.error();
}
- if (projectPlan.getDelay() < 0){
- throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
+
+// if (projectPlan.getDelay() < 0){
+// throw new CoolException("寤舵湡澶╂暟涓嶅彲涓鸿礋鏁�");
+// }
+ Date endTime = projectPlan.getEndTime();
+ Date realEndTime = projectPlan.getRealEndTime();
+ //濡傛灉瀹為檯缁撴潫鏃堕棿澶т簬棰勮鏃堕棿
+ if (!Cools.isEmpty(endTime) && !Cools.isEmpty(realEndTime) && realEndTime.getTime() > endTime.getTime() ){
+ long day = (realEndTime.getTime() - endTime.getTime()) / 1000 / 60 / 60 / 24;
+ projectPlan.setDelay((int) day);
}
projectPlan.setModifyTime(new Date());
@@ -133,14 +141,19 @@
public R updateByHomepage(@RequestParam HashMap<String,Object> param){
String itemId = (String) param.get("itemId");
String weightNum = (String) param.get("weightNum");
- String realStartTime = (String) param.get("realStartTime");
+ //String realStartTime = (String) param.get("realStartTime");
String realEndTime = (String) param.get("realEndTime");
ProjectPlan projectPlan = projectPlanService.selectOne(new EntityWrapper<ProjectPlan>()
.eq("item_id", itemId)
.eq("weight_num", weightNum));
try {
- projectPlan.setRealStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realStartTime));
- projectPlan.setRealEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realEndTime));
+ //projectPlan.setRealStartTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realStartTime));
+ if (realEndTime == null || realEndTime.equals("")) {
+
+ }else {
+ projectPlan.setRealEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(realEndTime));
+
+ }
} catch (ParseException e) {
throw new RuntimeException(e);
}
@@ -148,6 +161,7 @@
return R.ok();
}
+
@RequestMapping(value = "/projectPlan/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value = "ids[]") Long[] ids) {
--
Gitblit v1.9.1