From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/UpdateInspectionItemTitleCmd.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/UpdateInspectionItemTitleCmd.java b/service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/UpdateInspectionItemTitleCmd.java
index 6e10604..4b3b3a4 100644
--- a/service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/UpdateInspectionItemTitleCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/UpdateInspectionItemTitleCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.community.cmd.inspectionItemTitle;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -22,15 +23,18 @@
import com.java110.core.event.cmd.AbstractServiceCmdListener;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspectionItemTitle.InspectionItemTitleDto;
import com.java110.intf.community.IInspectionItemTitleV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionItemTitleValueV1InnerServiceSMO;
import com.java110.po.inspectionItemTitle.InspectionItemTitlePo;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -46,30 +50,62 @@
@Java110Cmd(serviceCode = "inspectionItemTitle.updateInspectionItemTitle")
public class UpdateInspectionItemTitleCmd extends AbstractServiceCmdListener {
- private static Logger logger = LoggerFactory.getLogger(UpdateInspectionItemTitleCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(UpdateInspectionItemTitleCmd.class);
@Autowired
private IInspectionItemTitleV1InnerServiceSMO inspectionItemTitleV1InnerServiceSMOImpl;
+ @Autowired
+ private IInspectionItemTitleValueV1InnerServiceSMO inspectionItemTitleValueV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "titleId", "titleId涓嶈兘涓虹┖");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
-
+ Assert.hasKeyAndValue(reqJson, "communityId", "communityId涓嶈兘涓虹┖");
+ JSONArray titleValues = null;
+ if (!InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+ titleValues = reqJson.getJSONArray("titleValues");
+ if (titleValues.size() < 1) {
+ throw new IllegalArgumentException("鏈寘鍚�夐」");
+ }
+ }
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
+ InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
int flag = inspectionItemTitleV1InnerServiceSMOImpl.updateInspectionItemTitle(inspectionItemTitlePo);
if (flag < 1) {
throw new CmdException("鏇存柊鏁版嵁澶辫触");
}
+ if (InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(inspectionItemTitlePo.getTitleType())) {
+ cmdDataFlowContext.setResponseEntity(ResultVo.success());
+ return;
+ }
+ InspectionItemTitleValuePo deleteInspectionItemTitleValuePo = new InspectionItemTitleValuePo();
+ deleteInspectionItemTitleValuePo.setTitleId(inspectionItemTitlePo.getTitleId());
+ flag = inspectionItemTitleValueV1InnerServiceSMOImpl.deleteInspectionItemTitleValue(deleteInspectionItemTitleValuePo);
+ if (flag < 1) {
+ throw new CmdException("鏇存柊鏁版嵁澶辫触");
+ }
+
+ JSONArray titleValues = reqJson.getJSONArray("titleValues");
+ InspectionItemTitleValuePo reportInfoSettingTitleValuePo = null;
+ for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+ reportInfoSettingTitleValuePo = new InspectionItemTitleValuePo();
+ reportInfoSettingTitleValuePo.setItemValue(titleValues.getJSONObject(titleValueIndex).getString("itemValue"));
+ reportInfoSettingTitleValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+ reportInfoSettingTitleValuePo.setTitleId(inspectionItemTitlePo.getTitleId());
+ reportInfoSettingTitleValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+ reportInfoSettingTitleValuePo.setCommunityId(inspectionItemTitlePo.getCommunityId());
+ inspectionItemTitleValueV1InnerServiceSMOImpl.saveInspectionItemTitleValue(reportInfoSettingTitleValuePo);
+ }
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0