From c7fd687b61cd48deb75325183e230a3c33b345e8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 15 三月 2023 23:26:23 +0800
Subject: [PATCH] 优化保养转单功能
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 90 insertions(+), 22 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 f9b8ab2..d042d73 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
@@ -10,20 +10,24 @@
import com.java110.common.dao.IWorkflowStepStaffServiceDao;
import com.java110.core.annotation.Java110Transactional;
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.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.Base64Convert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -43,7 +47,6 @@
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -80,6 +83,13 @@
private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
@Autowired
+ private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOaWorkflowActivitiInnerServiceSMO oaWorkflowActivitiInnerServiceSMOImpl;
+
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
@@ -98,7 +108,7 @@
List<Map> workflows = workflowServiceDaoImpl.getWorkflowInfo(BeanConvertUtil.beanCovertMap(workflowDto));
if (workflows == null || workflows.size() < 1) {
- return null;
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌娴佺▼");
}
WorkflowDto tmpWorkflowDto = BeanConvertUtil.covertBean(workflows.get(0), WorkflowDto.class);
@@ -129,17 +139,20 @@
}
Map staffInfo = workflowStepStaffs.get(0);
+ String staffId = staffInfo.get("staffId") + "";
+ OrgStaffRelDto orgDto = new OrgStaffRelDto();
+ if (staffId.startsWith("${")) {
+ return ResultVo.createResponseEntity(orgDto);
+ }
+ orgDto.setStaffId(staffId);
- OrgDto orgDto = new OrgDto();
- orgDto.setStaffId(staffInfo.get("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);
@@ -156,17 +169,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());
- String encoded = Base64Convert.byteToBase64(bpmnBytes);
- byte[] decoded = Base64Convert.base64ToByte(encoded);
- String xml = new String(decoded);
+ 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())
@@ -180,6 +196,7 @@
.createProcessDefinitionQuery()
.deploymentId(deploymentid)
.singleResult();
+
//鏇存柊閮ㄩ棬娴佺▼鍏崇郴琛�
workflowModelDto.setDeploymentId(deploymentid);
@@ -258,7 +275,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"))) {
@@ -295,7 +312,7 @@
sql.append("state varchar(12) not null COMMENT '鐘舵�� 1001 鐢宠 1002 寰呭鏍� 1003 閫�鍥� 1004 濮旀墭 1005 鍔炵粨',");
sql.append("create_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',");
sql.append("status_cd varchar(2) NOT NULL DEFAULT '0' COMMENT '鏁版嵁鐘舵�侊紝璇︾粏鍙傝�僣_status琛紝S 淇濆瓨锛�0, 鍦ㄧ敤 1澶辨晥'");
- sql.append(")");
+ sql.append(") DEFAULT CHARSET=utf8");
logger.debug("閮ㄧ讲琛ㄥ崟sql" + sql.toString());
oaWorkflowFormInnerServiceSMOImpl.createTable(sql.toString());
@@ -325,6 +342,9 @@
//杩欓噷鍐冲畾瀵筨pmn xml 鏂囦欢鍋氳繃婊ゅ鐞�
dealBpmnXml(workflowModelDto);
+
+ //涓氬姟鏍￠獙
+ businessCheck(oaWorkflowDtos.get(0), workflowModelDto);
OaWorkflowXmlPo oaWorkflowXmlPo = new OaWorkflowXmlPo();
oaWorkflowXmlPo.setStoreId(oaWorkflowDtos.get(0).getStoreId());
@@ -359,7 +379,9 @@
model.setName(oaWorkflowDtos.get(0).getFlowName());
model.setKey("java110_" + oaWorkflowDtos.get(0).getFlowId());
repositoryService.saveModel(model);
- repositoryService.addModelEditorSource(model.getId(), workflowModelDto.getJson_xml().getBytes("utf-8"));
+ String jsonXml = workflowModelDto.getJson_xml();
+ jsonXml = jsonXml.replaceAll("camunda:assignee", "activiti:assignee");
+ repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
InputStream svgStream = new ByteArrayInputStream(workflowModelDto.getSvg_xml().getBytes("utf-8"));
TranscoderInput input = new TranscoderInput(svgStream);
@@ -391,6 +413,41 @@
return ResultVo.success();
}
+
+ //涓氬姟鏍￠獙
+ private void businessCheck(OaWorkflowDto oaWorkflowDto, WorkflowModelDto workflowModelDto) {
+ if (OaWorkflowDto.FLOW_TYPE_VISIT.equals(oaWorkflowDto.getFlowType())) {
+ businessVisitCheck(oaWorkflowDto, workflowModelDto);
+ }
+ }
+
+ /**
+ * 璁垮鏍￠獙
+ *
+ * @param oaWorkflowDto
+ * @param workflowModelDto
+ */
+ private void businessVisitCheck(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
*
@@ -410,8 +467,13 @@
for (Element userTask : userTasks) {
Attribute assignee = userTask.attribute("assignee");
if (assignee == null) {
- userTask.addAttribute("activiti:assignee", "${nextUserId}");
+ userTask.addAttribute("camunda:assignee", "${nextUserId}");
}
+ }
+
+ Attribute activiti = rootElement.attribute("activiti");
+ if (activiti == null) {
+ rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
}
Attribute processId = process.attribute("id");
@@ -422,6 +484,8 @@
String processIdValue = processId.getValue();
String newXml = rootElement.asXML();
newXml = newXml.replaceAll(processIdValue, "java110_" + workflowModelDto.getFlowId());
+
+
workflowModelDto.setJson_xml(newXml);
}
@@ -436,13 +500,17 @@
Element rootElement = doc.getRootElement();
Element process = rootElement.element("process");
- List<Element> userTasks = process.elements("userTask1");
+ List<Element> userTasks = process.elements("userTask");
for (Element userTask : userTasks) {
Attribute assignee = userTask.attribute("assignee");
if (assignee == null) {
- userTask.addAttribute("camunda:assignee", "${createUserId}");
+ userTask.addAttribute("activiti:assignee", "${createUserId}");
}
}
+ Attribute activiti = rootElement.attribute("activiti");
+ if (activiti == null) {
+ rootElement.addAttribute("xmlns:activiti", "http://activiti.org/bpmn");
+ }
Attribute processId = process.attribute("id");
if (processId == null) {
--
Gitblit v1.8.0