From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 82 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 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 6b6c584..dfcb27a 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,17 +12,20 @@
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.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.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -79,6 +82,13 @@
private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
@Autowired
+ private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
+
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
@@ -129,16 +139,19 @@
Map staffInfo = workflowStepStaffs.get(0);
String staffId = staffInfo.get("staffId") + "";
- OrgDto orgDto = new OrgDto();
+ OrgStaffRelDto orgDto = new OrgStaffRelDto();
if (staffId.startsWith("${")) {
return ResultVo.createResponseEntity(orgDto);
}
orgDto.setStaffId(staffId);
- List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
- if (orgDtos == null || orgDtos.size() < 1) {
+
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setStaffId(staffId);
+ List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelV1InnerServiceSMOImpl.queryStaffOrgNames(orgStaffRelDto);
+ if (orgStaffRelDtos == null || orgStaffRelDtos.size() < 1) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌鍛樺伐缁勭粐淇℃伅");
}
- orgDto = orgDtos.get(0);
+ orgDto = orgStaffRelDtos.get(0);
orgDto.setStaffName(staffInfo.get("staffName") + "");
return ResultVo.createResponseEntity(orgDto);
@@ -155,14 +168,20 @@
Assert.listOnlyOne(oaWorkflowDtos, "鏈寘鍚祦绋�");
- //琛ㄥ崟 閮ㄧ讲
- deployForm(oaWorkflowDtos.get(0));
+ //鏅�氭祦绋嬮渶瑕侀儴缃� 琛ㄥ崟 鍏朵粬绫诲瀷涓嶉渶瑕侀儴缃�
+ if (OaWorkflowDto.FLOW_TYPE_PUBLIC.equals(oaWorkflowDtos.get(0).getFlowType())) {
+ //琛ㄥ崟 閮ㄧ讲
+ deployForm(oaWorkflowDtos.get(0));
+ }
String deploymentid = "";
try {
Model modelData = repositoryService.getModel(workflowModelDto.getModelId());
byte[] bpmnBytes = null;
bpmnBytes = repositoryService.getModelEditorSource(workflowModelDto.getModelId());
+ if (bpmnBytes == null || bpmnBytes.length < 1) {
+ throw new CmdException("鏈缃祦绋�");
+ }
String processName = modelData.getName() + ".bpmn20.xml";
ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
Deployment deployment = repositoryService.createDeployment().name(oaWorkflowDtos.get(0).getFlowName())
@@ -176,6 +195,7 @@
.createProcessDefinitionQuery()
.deploymentId(deploymentid)
.singleResult();
+
//鏇存柊閮ㄩ棬娴佺▼鍏崇郴琛�
workflowModelDto.setDeploymentId(deploymentid);
@@ -254,7 +274,7 @@
sql.append(" varchar");
isVarchar = true;
} else if ("textarea".equals(component.getString("type"))) {
- sql.append(" longtext");
+ sql.append(" longtext CHARACTER SET utf8");
} else if ("textdate".equals(component.getString("type"))) {
sql.append(" date");
} else if ("textdatetime".equals(component.getString("type"))) {
@@ -322,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());
@@ -389,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