From bbaae1412d6bcd8313e7cbee6170b55837350d20 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 07 九月 2023 17:46:40 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 d042d73..8754d26 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,12 +12,11 @@
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;
@@ -25,7 +24,7 @@
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;
@@ -189,7 +188,8 @@
.addInputStream(processName, in).deploy();
deploymentid = deployment.getId();
} catch (Exception e) {
- throw new IllegalArgumentException(e);
+ e.printStackTrace();
+ throw new IllegalArgumentException("娴佺▼鏈繚瀛樻垨鑰呰缃敊璇�");
}
Assert.isTrue(!StringUtil.isEmpty(deploymentid), "娴佺▼閮ㄧ讲鍑洪敊");
ProcessDefinition processDefinition = repositoryService
@@ -417,17 +417,21 @@
//涓氬姟鏍￠獙
private void businessCheck(OaWorkflowDto oaWorkflowDto, WorkflowModelDto workflowModelDto) {
if (OaWorkflowDto.FLOW_TYPE_VISIT.equals(oaWorkflowDto.getFlowType())) {
- businessVisitCheck(oaWorkflowDto, workflowModelDto);
+ businessFirstAuditCheck(oaWorkflowDto, workflowModelDto);
+ }
+
+ if(OaWorkflowDto.FLOW_TYPE_OWNER_SETTLED.equals(oaWorkflowDto.getFlowType())){
+ businessFirstAuditCheck(oaWorkflowDto, workflowModelDto);
}
}
/**
- * 璁垮鏍￠獙
+ * 绗竴瀹℃壒浜哄繀椤昏鍥哄畾
*
* @param oaWorkflowDto
* @param workflowModelDto
*/
- private void businessVisitCheck(OaWorkflowDto oaWorkflowDto, WorkflowModelDto workflowModelDto) {
+ private void businessFirstAuditCheck(OaWorkflowDto oaWorkflowDto, WorkflowModelDto workflowModelDto) {
OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
oaWorkflowXmlDto.setBpmnXml(workflowModelDto.getJson_xml());
List<JSONObject> outs = oaWorkflowActivitiInnerServiceSMOImpl.queryFirstAuditStaff(oaWorkflowXmlDto);
--
Gitblit v1.8.0