From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 95 insertions(+), 9 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 34940f0..eb0d905 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
@@ -3,21 +3,24 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractChangePlan.ContractChangePlanDto;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.store.IContractChangePlanInnerServiceSMO;
+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;
+import org.activiti.engine.impl.identity.Authentication;
import org.activiti.engine.query.Query;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
@@ -49,7 +52,8 @@
@Autowired
private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
-
+ @Autowired
+ private RepositoryService repositoryService;
/**
* 鍚姩娴佺▼
@@ -60,9 +64,11 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("contractChangePlanDto", contractChangePlanDto);
-
+ variables.put("userId", contractChangePlanDto.getCurrentUserId());
+ variables.put("startUserId", contractChangePlanDto.getCurrentUserId());
+ variables.put("nextUserId", contractChangePlanDto.getNextUserId());
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(contractChangePlanDto.getStoreId()), variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(contractChangePlanDto.getStoreId()),contractChangePlanDto.getPlanId(), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
@@ -115,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) {
@@ -128,7 +168,9 @@
List<ContractChangePlanDto> tmpContractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(contractChangePlanDto);
for (ContractChangePlanDto tmpContractChangePlanDto : tmpContractChangePlanDtos) {
- tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getContractId()));
+ tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId()));
+ tmpContractChangePlanDto.setHasAudit(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId() + "_hasAudit"));
+ tmpContractChangePlanDto.setHasEnd(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId() + "_hasEnd"));
}
return tmpContractChangePlanDtos;
}
@@ -254,9 +296,53 @@
List<ContractChangePlanDto> tmpContractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(contractChangePlanDto);
for (ContractChangePlanDto tmpContractChangePlanDto : tmpContractChangePlanDtos) {
- tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getContractId()));
+ tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId()));
}
return tmpContractChangePlanDtos;
}
+ public boolean completeTask(@RequestBody ContractChangePlanDto contractChangePlanDto) {
+ TaskService taskService = processEngine.getTaskService();
+ Task task = taskService.createTaskQuery().taskId(contractChangePlanDto.getTaskId()).singleResult();
+ String processInstanceId = task.getProcessInstanceId();
+ Authentication.setAuthenticatedUserId(contractChangePlanDto.getCurrentUserId());
+ taskService.addComment(contractChangePlanDto.getTaskId(), processInstanceId, contractChangePlanDto.getAuditMessage());
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("auditCode", contractChangePlanDto.getAuditCode());
+ 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();
+ if (pi == null) {
+ return true;
+ }
+ return false;
+ }
+
+
+ //鍒犻櫎浠诲姟
+ public boolean deleteTask(@RequestBody ContractChangePlanPo contractChangePlanPo) {
+ TaskService taskService = processEngine.getTaskService();
+
+ TaskQuery query = taskService.createTaskQuery().processInstanceBusinessKey(contractChangePlanPo.getPlanId());
+ query.orderByTaskCreateTime().desc();
+ List<Task> list = query.list();
+
+ if (list == null || list.size() < 1) {
+ return true;
+ }
+
+ for (Task task : list) {
+ String processInstanceId = task.getProcessInstanceId();
+ //3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
+ runtimeService.deleteProcessInstance(processInstanceId, "鍙栨秷鍚堝悓");
+
+ }
+
+ return true;
+ }
+
}
--
Gitblit v1.8.0