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/UpdateMaintainanceTaskCmd.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskCmd.java
index ff60531..603add5 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainanceTask/UpdateMaintainanceTaskCmd.java
@@ -22,15 +22,21 @@
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.intf.community.IMaintainanceTaskV1InnerServiceSMO;
import com.java110.po.maintainanceTask.MaintainanceTaskPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
/**
@@ -46,7 +52,7 @@
@Java110Cmd(serviceCode = "maintainanceTask.updateMaintainanceTask")
public class UpdateMaintainanceTaskCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(UpdateMaintainanceTaskCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateMaintainanceTaskCmd.class);
@Autowired
@@ -55,7 +61,7 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "taskId", "taskId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
+ Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
}
@@ -63,11 +69,43 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- MaintainanceTaskPo maintainanceTaskPo = BeanConvertUtil.covertBean(reqJson, MaintainanceTaskPo.class);
- int flag = maintainanceTaskV1InnerServiceSMOImpl.updateMaintainanceTask(maintainanceTaskPo);
+ MaintainanceTaskDto maintainanceTaskDto1 = new MaintainanceTaskDto();
+ maintainanceTaskDto1.setCommunityId(reqJson.getString("communityId"));
+ maintainanceTaskDto1.setTaskId(reqJson.getString("taskId"));
+ List<MaintainanceTaskDto> maintainanceTaskDtoList = maintainanceTaskV1InnerServiceSMOImpl.queryMaintainanceTasks(maintainanceTaskDto1);
+ if (maintainanceTaskDtoList.size()!= 1) {
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "鏈壘鍒颁繚鍏讳换鍔′俊鎭垨鎵惧埌澶氭潯锛�");
+ cmdDataFlowContext.setResponseEntity(responseEntity);
+ return;
+ }
+ MaintainanceTaskDto maintainanceTaskDto = new MaintainanceTaskDto();
+ maintainanceTaskDto.setTaskId(reqJson.getString("taskId"));
+ maintainanceTaskDto.setCommunityId(reqJson.getString("communityId"));
+ List<MaintainanceTaskDto> maintainanceTaskDtos = maintainanceTaskV1InnerServiceSMOImpl.queryMaintainanceTasks(maintainanceTaskDto);
+
+ Assert.listOnlyOne(maintainanceTaskDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑淇濆吇浠诲姟 鎴栧鏉℃暟鎹�");
+
+ JSONObject businessMaintainanceTask = new JSONObject();
+ businessMaintainanceTask.putAll(BeanConvertUtil.beanCovertMap(maintainanceTaskDtos.get(0)));
+
+ MaintainanceTaskPo maintainanceTaskPo = BeanConvertUtil.covertBean(businessMaintainanceTask, MaintainanceTaskPo.class);
+ maintainanceTaskPo.setActInsTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ maintainanceTaskPo.setActUserId(reqJson.getString("userId"));
+ maintainanceTaskPo.setActUserName(reqJson.getString("userName"));
+ maintainanceTaskPo.setState(reqJson.getString("state"));
+ if(!StringUtil.isEmpty(reqJson.getString("taskType")) && reqJson.getString("taskType").equals("2000") ){
+// maintainanceTaskPo.setOriginalPlanUserId(maintainanceTaskPo.getPlanUserId());
+// maintainanceTaskPo.setOriginalPlanUserName(maintainanceTaskPo.getPlanUserName());
+ maintainanceTaskPo.setPlanUserId(reqJson.getString("staffId"));
+ maintainanceTaskPo.setPlanUserName(reqJson.getString("staffName"));
+ maintainanceTaskPo.setTaskType(reqJson.getString("taskType"));
+ maintainanceTaskPo.setTransferDesc(reqJson.getString("transferDesc"));
+ }
+
+ int flag = maintainanceTaskV1InnerServiceSMOImpl.updateMaintainanceTask(maintainanceTaskPo);
if (flag < 1) {
- throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ throw new CmdException("鍒犻櫎鏁版嵁澶辫触");
}
cmdDataFlowContext.setResponseEntity(ResultVo.success());
--
Gitblit v1.8.0