From 873197abd3ae5e447f57683031cea6896f0cf2aa Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 十月 2022 13:01:15 +0800
Subject: [PATCH] 加入营销商品功能
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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..20555fa 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,22 @@
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.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.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 +45,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 +81,9 @@
private IOaWorkflowFormInnerServiceSMO oaWorkflowFormInnerServiceSMOImpl;
@Autowired
+ private IOrgStaffRelV1InnerServiceSMO orgStaffRelV1InnerServiceSMOImpl;
+
+ @Autowired
private RepositoryService repositoryService;
@Autowired
@@ -98,7 +102,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 +133,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);
@@ -164,9 +171,6 @@
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);
String processName = modelData.getName() + ".bpmn20.xml";
ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
Deployment deployment = repositoryService.createDeployment().name(oaWorkflowDtos.get(0).getFlowName())
@@ -258,7 +262,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 +299,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());
@@ -359,7 +363,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);
@@ -410,8 +416,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 +433,8 @@
String processIdValue = processId.getValue();
String newXml = rootElement.asXML();
newXml = newXml.replaceAll(processIdValue, "java110_" + workflowModelDto.getFlowId());
+
+
workflowModelDto.setJson_xml(newXml);
}
@@ -436,13 +449,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