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/visit/SaveVisitSettingCmd.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java
index 6a1189f..f891f39 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/SaveVisitSettingCmd.java
@@ -29,11 +29,14 @@
import com.java110.intf.community.IParkingAreaInnerServiceSMO;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
+import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
import com.java110.po.visitSetting.VisitSettingPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.BpmnXml;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +72,9 @@
private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
@Autowired
+ private IOaWorkflowXmlInnerServiceSMO oaWorkflowXmlInnerServiceSMOImpl;
+
+ @Autowired
private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
@Override
@@ -77,6 +83,7 @@
Assert.hasKeyAndValue(reqJson, "faceWay", "璇锋眰鎶ユ枃涓湭鍖呭惈faceWay");
Assert.hasKeyAndValue(reqJson, "carNumWay", "璇锋眰鎶ユ枃涓湭鍖呭惈carNumWay");
// Assert.hasKeyAndValue(reqJson, "paId", "璇锋眰鎶ユ枃涓湭鍖呭惈paId");
+
Assert.hasKeyAndValue(reqJson, "auditWay", "璇锋眰鎶ユ枃涓湭鍖呭惈auditWay");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
}
@@ -102,6 +109,20 @@
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+
+ //榛樿 娴佺▼鍥句互闃茬敾閿�
+ OaWorkflowXmlPo oaWorkflowXmlPo = new OaWorkflowXmlPo();
+ oaWorkflowXmlPo.setStoreId(storeId);
+ oaWorkflowXmlPo.setFlowId(oaWorkflowPo.getFlowId());
+ oaWorkflowXmlPo.setXmlId(GenerateCodeFactory.getGeneratorId("79"));
+ oaWorkflowXmlPo.setSvgXml("");
+ oaWorkflowXmlPo.setBpmnXml(BpmnXml.getDefaultVisitBpmnXml(oaWorkflowPo.getFlowId()));
+
+ flag = oaWorkflowXmlInnerServiceSMOImpl.saveOaWorkflowXml(oaWorkflowXmlPo);
+ if (flag < 1) {
+ throw new CmdException("淇濆瓨妯″瀷鏁版嵁澶辫触");
+ }
+
VisitSettingPo visitSettingPo = BeanConvertUtil.covertBean(reqJson, VisitSettingPo.class);
visitSettingPo.setSettingId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
visitSettingPo.setFlowId(oaWorkflowPo.getFlowId());
--
Gitblit v1.8.0