From 320ed3f4782f9662f79ecfe14d2cf3f34dd288c5 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 01 八月 2023 19:52:36 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 90ffd3d..fac4b2b 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -18,6 +18,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -115,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());
@@ -125,6 +136,31 @@
projectPlanService.updateById(projectPlan);
return R.ok();
}
+
+ @RequestMapping("/projectPlan/update/homepage")
+ 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 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));
+ 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);
+ }
+ projectPlanService.updateById(projectPlan);
+ return R.ok();
+ }
+
@RequestMapping(value = "/projectPlan/delete/auth")
@ManagerAuth
@@ -323,7 +359,7 @@
for (Item item : itemsArray) {
ItemDTO itemDto = new ItemDTO();
itemDto.setProjectName(item.getName());
- itemDto.setProjectType(item.getType());
+ itemDto.setProjectType(item.getType$());
itemDto.setProjectStartTime(item.getStartTime$());
itemDto.setProjectEndTime(item.getEndTime$());
List<ProjectPlan> projectPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
--
Gitblit v1.9.1