From 3c30601b336ee132ed7293cbb6564a63f9db3d59 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 三月 2022 14:34:49 +0800
Subject: [PATCH] 优化现金扣费bug
---
service-common/src/main/java/com/java110/common/smo/impl/ContractChangeUserInnerServiceSMOImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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..23b9e19 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,12 +3,15 @@
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.StringUtil;
import org.activiti.engine.HistoryService;
@@ -18,6 +21,7 @@
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;
@@ -60,9 +64,10 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("contractChangePlanDto", contractChangePlanDto);
-
+ variables.put("userId", contractChangePlanDto.getCurrentUserId());
+ variables.put("startUserId", contractChangePlanDto.getCurrentUserId());
//寮�鍚祦绋�
- 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);
@@ -128,7 +133,7 @@
List<ContractChangePlanDto> tmpContractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(contractChangePlanDto);
for (ContractChangePlanDto tmpContractChangePlanDto : tmpContractChangePlanDtos) {
- tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getContractId()));
+ tmpContractChangePlanDto.setTaskId(taskBusinessKeyMap.get(tmpContractChangePlanDto.getPlanId()));
}
return tmpContractChangePlanDtos;
}
@@ -254,9 +259,52 @@
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());
+ 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