From eaa8b5e81756497048a1fc5bcec4f0df435d81fc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 02 四月 2022 13:08:48 +0800
Subject: [PATCH] 合同变更加入动态 指定人
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java | 1 +
service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
index 1bff50a..b6c525c 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java
@@ -13,11 +13,10 @@
import com.java110.po.contract.ContractPo;
import com.java110.po.contractChangePlan.ContractChangePlanPo;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.FlowUtil;
import com.java110.utils.util.StringUtil;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.bpmn.model.*;
+import org.activiti.engine.*;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.history.HistoricTaskInstanceQuery;
@@ -53,7 +52,8 @@
@Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
-
+ @Autowired
+ private RepositoryService repositoryService;
/**
* 鍚姩娴佺▼
@@ -121,6 +121,40 @@
String business_key = pi.getBusinessKey();
contractIds.add(business_key);
taskBusinessKeyMap.put(business_key, task.getId());
+
+ //璁＄畻鏄惁鏈� 瀹℃牳鎸夐挳
+ BpmnModel bpmnModel = repositoryService.getBpmnModel(task.getProcessDefinitionId());
+ FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
+ //鑾峰彇褰撳墠鑺傜偣杈撳嚭杩炵嚎
+ List<SequenceFlow> outgoingFlows = flowNode.getOutgoingFlows();
+ //璁＄畻鏄惁鏈夌粨鏉熸寜閽�
+ boolean isReturn;
+ for (SequenceFlow outgoingFlow : outgoingFlows) {
+ //鑾峰彇杈撳嚭鑺傜偣鍏冪礌
+ FlowElement targetFlowElement = outgoingFlow.getTargetFlowElement();
+ isReturn = false;
+ //鎺掗櫎闈炵敤鎴蜂换鍔℃帴鐐�
+ if (targetFlowElement instanceof UserTask) {
+ //鍒ゆ柇杈撳嚭鑺傜偣鐨別l琛ㄨ揪寮�
+ Map vars = new HashMap();
+ vars.put("flag", "false"); // 1100
+ if (FlowUtil.isCondition(outgoingFlow.getConditionExpression(), vars)) {
+ isReturn = true;
+ }
+
+ if (!isReturn) {
+ String assignee = ((UserTask) targetFlowElement).getAssignee();
+ if (!StringUtil.isEmpty(assignee)) {
+ taskBusinessKeyMap.put(business_key + "_hasAudit", "1");
+ }
+ }
+ }
+ //濡傛灉涓嬩竴涓负 缁撴潫鑺傜偣
+ if (targetFlowElement instanceof EndEvent) {
+ //true 鑾峰彇杈撳嚭鑺傜偣鍚嶇О
+ taskBusinessKeyMap.put(business_key + "_hasEnd", "1");
+ }
+ }
}
if (contractIds == null || contractIds.size() == 0) {
@@ -135,6 +169,8 @@
for (ContractChangePlanDto tmpContractChangePlanDto : tmpContractChangePlanDtos) {
tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId()));
+ tmpContractChangePlanDto.setHasAudit(taskBusinessKeyMap.get(tmpContractChangePlanDto.getContractId() + "_hasAudit"));
+ tmpContractChangePlanDto.setHasEnd(taskBusinessKeyMap.get(tmpContractChangePlanDto.getContractId() + "_hasEnd"));
}
return tmpContractChangePlanDtos;
}
@@ -276,6 +312,7 @@
variables.put("currentUserId", contractChangePlanDto.getCurrentUserId());
variables.put("flag", "1200".equals(contractChangePlanDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", contractChangePlanDto.getStartUserId());
+ variables.put("nextUserId", contractChangePlanDto.getNextUserId());
taskService.complete(contractChangePlanDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
index 78326d9..e39e1a7 100755
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -185,6 +185,7 @@
List<ContractChangePlanDto> contractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(tmpContractChangePlanDto);
Assert.listOnlyOne(contractChangePlanDtos, "鍚堝悓璁″垝涓嶅瓨鍦�");
contractChangePlanDto.setStartUserId(contractChangePlanDtos.get(0).getChangePerson());
+ contractChangePlanDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractChangeUserInnerServiceSMOImpl.completeTask(contractChangePlanDto);
if (isLastTask) {
--
Gitblit v1.8.0