From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/ownerCommittee/SaveOwnerCommitteeCmd.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/ownerCommittee/SaveOwnerCommitteeCmd.java b/service-user/src/main/java/com/java110/user/cmd/ownerCommittee/SaveOwnerCommitteeCmd.java
index 4a58c55..eab2757 100644
--- a/service-user/src/main/java/com/java110/user/cmd/ownerCommittee/SaveOwnerCommitteeCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/ownerCommittee/SaveOwnerCommitteeCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.user.cmd.ownerCommittee;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -22,8 +23,10 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.user.IOwnerCommitteeContractV1InnerServiceSMO;
import com.java110.intf.user.IOwnerCommitteeV1InnerServiceSMO;
-import com.java110.po.ownerCommittee.OwnerCommitteePo;
+import com.java110.po.owner.OwnerCommitteePo;
+import com.java110.po.owner.OwnerCommitteeContractPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -33,6 +36,10 @@
import org.slf4j.LoggerFactory;
/**
+ * {"ocId":"","name":"寮犱笁","sex":"B","link":"18909711425","idCard":"63212652452455","address":"璋佹槸璋�","position":"璇曡瘯","post":"璋佹槸璋�","postDesc":"璇曡瘯",
+ * "appointTime":"璋佹槸璋�","curTime":"璇曡瘯","state":"1000","remark":"璋佹槸璋�",
+ * "contracts":[{"id":"6545bf9d-d1e8-4419-b744-df40d098f9ac","relName":"xxx","name":"xxx","link":"xxx","address":"xxx"}],
+ * "communityId":"2023013154290059"}
* 绫昏〃杩帮細淇濆瓨
* 鏈嶅姟缂栫爜锛歰wnerCommittee.saveOwnerCommittee
* 璇锋眰璺姴锛�/app/ownerCommittee.SaveOwnerCommittee
@@ -52,14 +59,18 @@
@Autowired
private IOwnerCommitteeV1InnerServiceSMO ownerCommitteeV1InnerServiceSMOImpl;
+ @Autowired
+ private IOwnerCommitteeContractV1InnerServiceSMO ownerCommitteeContractV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
-Assert.hasKeyAndValue(reqJson, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
-Assert.hasKeyAndValue(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
-Assert.hasKeyAndValue(reqJson, "position", "璇锋眰鎶ユ枃涓湭鍖呭惈position");
-Assert.hasKeyAndValue(reqJson, "post", "璇锋眰鎶ユ枃涓湭鍖呭惈post");
-Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
+ Assert.hasKeyAndValue(reqJson, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
+ Assert.hasKeyAndValue(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
+ Assert.hasKeyAndValue(reqJson, "position", "璇锋眰鎶ユ枃涓湭鍖呭惈position");
+ Assert.hasKeyAndValue(reqJson, "post", "璇锋眰鎶ユ枃涓湭鍖呭惈post");
+ Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
}
@@ -67,7 +78,7 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- OwnerCommitteePo ownerCommitteePo = BeanConvertUtil.covertBean(reqJson, OwnerCommitteePo.class);
+ OwnerCommitteePo ownerCommitteePo = BeanConvertUtil.covertBean(reqJson, OwnerCommitteePo.class);
ownerCommitteePo.setOcId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
int flag = ownerCommitteeV1InnerServiceSMOImpl.saveOwnerCommittee(ownerCommitteePo);
@@ -75,6 +86,26 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+ if (!reqJson.containsKey("contracts")) {
+ return;
+ }
+
+ JSONArray contracts = reqJson.getJSONArray("contracts");
+
+ if (contracts == null || contracts.size() < 1) {
+ return;
+ }
+ OwnerCommitteeContractPo ownerCommitteeContractPo = null;
+
+ for (int contractIndex = 0; contractIndex < contracts.size(); contractIndex++) {
+ ownerCommitteeContractPo = BeanConvertUtil.covertBean(contracts.getJSONObject(contractIndex), OwnerCommitteeContractPo.class);
+ ownerCommitteeContractPo.setContractId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+ ownerCommitteeContractPo.setOcId(ownerCommitteePo.getOcId());
+ ownerCommitteeContractPo.setCommunityId(ownerCommitteePo.getCommunityId());
+ ownerCommitteeContractV1InnerServiceSMOImpl.saveOwnerCommitteeContract(ownerCommitteeContractPo);
+ }
+
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0