From c0328edb2de39f27e47b7ad1eedf8f80b883335e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 24 一月 2023 17:41:49 +0800
Subject: [PATCH] 优化 供应链 类型的bug
---
service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java
index e04dc57..7f24320 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java
@@ -22,6 +22,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.maintainanceTask.MaintainanceTaskDto;
import com.java110.dto.maintainanceTaskDetail.MaintainanceTaskDetailDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
@@ -144,7 +145,7 @@
*/
public void addPhoto(JSONObject paramInJson) {
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", "-1");
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId("10"));
businessUnit.put("relTypeCd", "90000");
businessUnit.put("saveWay", "ftp");
businessUnit.put("objId", paramInJson.getString("taskDetailId"));
@@ -189,7 +190,7 @@
String pointStartTime = maintainanceTaskDetailDtos.get(0).getPointStartTime();
String pointEndTime = maintainanceTaskDetailDtos.get(0).getPointEndTime();
if (!StringUtil.isEmpty(pointStartTime)) {
- maintainanceStartTime = currentDate + " " + pointStartTime + ":00";
+ maintainanceStartTime = pointStartTime ;
Date startTime = format.parse(maintainanceStartTime);
planStartTime = startTime.getTime();
} else {
@@ -199,7 +200,7 @@
planStartTime = startTime.getTime();
}
if (!StringUtil.isEmpty(pointEndTime)) {
- maintainanceEndTime = currentDate + " " + pointEndTime + ":00";
+ maintainanceEndTime = pointEndTime ;
Date endTime = format.parse(maintainanceEndTime);
planFinishTime = endTime.getTime();
} else {
@@ -221,13 +222,15 @@
String maintainanceTime = maintainanceTaskDetailPoPo.getInspectionTime();
Date maintainanceDetailTime = format.parse(maintainanceTime);
long detailTime = maintainanceDetailTime.getTime();
- if (detailTime < planStartTime) { //濡傛灉宸℃鐐圭鍒版椂闂村皬浜庡贰妫�璁″垝寮�濮嬫椂闂达紝绛惧埌鐘舵�佸氨鏄棭鍒�
- maintainanceTaskDetailPoPo.setState("40000");
- } else if (detailTime > planFinishTime) { //濡傛灉宸℃鐐圭鍒版椂闂村ぇ浜庡贰妫�璁″垝缁撴潫鏃堕棿锛岀鍒扮姸鎬佸氨鏄繜鍒�
- maintainanceTaskDetailPoPo.setState("50000");
- } else { //濡傛灉宸℃鐐圭鍒版椂闂村湪宸℃璁″垝寮�濮嬫椂闂村拰宸℃璁″垝缁撴潫鏃堕棿涔嬮棿锛岀鍒扮姸鎬佸氨鏄甯�
- maintainanceTaskDetailPoPo.setState("60000");
- }
+ maintainanceTaskDetailPoPo.setState(MaintainanceTaskDetailDto.STATE_FINISH);
+
+// if (detailTime < planStartTime) { //濡傛灉宸℃鐐圭鍒版椂闂村皬浜庡贰妫�璁″垝寮�濮嬫椂闂达紝绛惧埌鐘舵�佸氨鏄棭鍒�
+// maintainanceTaskDetailPoPo.setState(MaintainanceTaskDetailDto.STATE_FINISH);
+// } else if (detailTime > planFinishTime) { //濡傛灉宸℃鐐圭鍒版椂闂村ぇ浜庡贰妫�璁″垝缁撴潫鏃堕棿锛岀鍒扮姸鎬佸氨鏄繜鍒�
+// maintainanceTaskDetailPoPo.setState("50000");
+// } else { //濡傛灉宸℃鐐圭鍒版椂闂村湪宸℃璁″垝寮�濮嬫椂闂村拰宸℃璁″垝缁撴潫鏃堕棿涔嬮棿锛岀鍒扮姸鎬佸氨鏄甯�
+// maintainanceTaskDetailPoPo.setState("60000");
+// }
int flag = maintainanceTaskDetailV1InnerServiceSMOImpl.updateMaintainanceTaskDetail(maintainanceTaskDetailPoPo);
--
Gitblit v1.8.0