From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskDetailCmd.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 edb97cf..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"));
@@ -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