From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
index 56d8f5c..5e1e6a1 100755
--- a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -12,19 +12,19 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
-import com.java110.dto.oaWorkflowForm.OaWorkflowFormDto;
-import com.java110.dto.oaWorkflowXml.OaWorkflowXmlDto;
-import com.java110.dto.org.OrgDto;
+import com.java110.dto.oaWorkflow.OaWorkflowFormDto;
+import com.java110.dto.oaWorkflow.OaWorkflowXmlDto;
import com.java110.dto.org.OrgStaffRelDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.dto.workflow.WorkflowModelDto;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.oaWorkflow.WorkflowModelDto;
+import com.java110.intf.common.IOaWorkflowActivitiInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowFormInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowXmlInnerServiceSMO;
import com.java110.intf.store.IOrgStaffRelV1InnerServiceSMO;
import com.java110.intf.user.IOrgInnerServiceSMO;
import com.java110.po.oaWorkflow.OaWorkflowPo;
-import com.java110.po.oaWorkflowXml.OaWorkflowXmlPo;
+import com.java110.po.oaWorkflow.OaWorkflowXmlPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -83,6 +83,10 @@
@Autowired
private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
+
@Autowired
private RepositoryService repositoryService;
@@ -165,7 +169,7 @@
Assert.listOnlyOne(oaWorkflowDtos, "鏈寘鍚祦绋�");
//鏅�氭祦绋嬮渶瑕侀儴缃� 琛ㄥ崟 鍏朵粬绫诲瀷涓嶉渶瑕侀儴缃�
- if(OaWorkflowDto.FLOW_TYPE_PUBLIC.equals(oaWorkflowDtos.get(0).getFlowType())) {
+ if (OaWorkflowDto.FLOW_TYPE_PUBLIC.equals(oaWorkflowDtos.get(0).getFlowType())) {
//琛ㄥ崟 閮ㄧ讲
deployForm(oaWorkflowDtos.get(0));
}
@@ -175,7 +179,7 @@
Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
byte[] bpmnBytes = null;
bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
- if(bpmnBytes == null || bpmnBytes.length< 1){
+ if (bpmnBytes == null || bpmnBytes.length < 1) {
throw new CmdException("鏈缃祦绋�");
}
String processName = modelData.getName() + ".bpmn20.xml";
@@ -338,6 +342,9 @@
//杩欓噷鍐冲畾瀵筨pmn xml 鏂囦欢鍋氳繃婊ゅ鐞�
dealBpmnXml(workflowModelDto);
+ //涓氬姟鏍￠獙
+ businessCheck(oaWorkflowDtos.get(0), workflowModelDto);
+
OaWorkflowXmlPo oaWorkflowXmlPo = new OaWorkflowXmlPo();
oaWorkflowXmlPo.setStoreId(oaWorkflowDtos.get(0).getStoreId());
oaWorkflowXmlPo.setBpmnXml(workflowModelDto.getJson_xml());
@@ -405,6 +412,45 @@
return ResultVo.success();
}
+
+ //涓氬姟鏍￠獙
+ private void businessCheck(OaWorkflowDto oaWorkflowDto, WorkflowModelDto workflowModelDto) {
+ if (OaWorkflowDto.FLOW_TYPE_VISIT.equals(oaWorkflowDto.getFlowType())) {
+ businessFirstAuditCheck(oaWorkflowDto, workflowModelDto);
+ }
+
+ if(OaWorkflowDto.FLOW_TYPE_OWNER_SETTLED.equals(oaWorkflowDto.getFlowType())){
+ businessFirstAuditCheck(oaWorkflowDto, workflowModelDto);
+ }
+ }
+
+ /**
+ * 绗竴瀹℃壒浜哄繀椤昏鍥哄畾
+ *
+ * @param oaWorkflowDto
+ * @param workflowModelDto
+ */
+ private void businessFirstAuditCheck(OaWorkflowDto oaWorkflowDto, WorkflowModelDto workflowModelDto) {
+ OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
+ oaWorkflowXmlDto.setBpmnXml(workflowModelDto.getJson_xml());
+ List<JSONObject> outs = oaWorkflowActivitiInnerServiceSMOImpl.queryFirstAuditStaff(oaWorkflowXmlDto);
+
+ if (outs == null || outs.size() < 1) {
+ throw new IllegalArgumentException("鎻愪氦鑰呬箣鍚庯紝绗竴瀹℃壒浜哄繀椤昏鎸囧畾鍏蜂綋瀹℃壒浜�");
+ }
+
+ String assignee = outs.get(0).getString("assignee");
+
+ if (StringUtil.isEmpty(assignee)) {
+ throw new IllegalArgumentException("鎻愪氦鑰呬箣鍚庯紝绗竴瀹℃壒浜哄繀椤昏鎸囧畾鍏蜂綋瀹℃壒浜�");
+ }
+
+ if (assignee.startsWith("-")) {
+ throw new IllegalArgumentException("鎻愪氦鑰呬箣鍚庯紝绗竴瀹℃壒浜哄繀椤昏鎸囧畾鍏蜂綋瀹℃壒浜�");
+ }
+
+ }
+
/**
* 杩囨护BpmnXml
*
--
Gitblit v1.8.0