From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java | 12 +++++++++---
1 files changed, 9 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 d604117..304eccd 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java
@@ -133,14 +133,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 +153,7 @@
return R.ok();
}
+
@RequestMapping(value = "/projectPlan/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value = "ids[]") Long[] ids) {
--
Gitblit v1.9.1