From 5ec06e72f39cae4dd599af6aa798c84c1919528b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 九月 2022 15:00:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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..d604117 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
@@ -122,6 +125,25 @@
projectPlan.setModifyTime(new Date());
projectPlan.setModifyId(getUserId());
+ 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));
+ 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();
}
@@ -323,7 +345,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