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/PurchaseApplyUserInnerServiceSMOImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
index e7c2137..c1a98e8 100755
--- a/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java
@@ -14,7 +14,9 @@
import com.java110.intf.store.IComplaintInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.contract.ContractPo;
import com.java110.po.machine.MachineRecordPo;
+import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -76,9 +78,11 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("purchaseApplyDto", purchaseApplyDto);
- variables.put("nextAuditStaffId", purchaseApplyDto.getStaffId());
+ variables.put("nextAuditStaffId", purchaseApplyDto.getNextStaffId());
variables.put("userId", purchaseApplyDto.getCurrentUserId());
variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
+ variables.put("nextUserId", purchaseApplyDto.getNextStaffId());
+
//寮�鍚祦绋�
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
//鑾峰彇鐢宠id
@@ -306,6 +310,7 @@
variables.put("currentUserId", purchaseApplyDto.getCurrentUserId());
variables.put("flag", "1200".equals(purchaseApplyDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", purchaseApplyDto.getStartUserId());
+ variables.put("nextUserId", purchaseApplyDto.getNextStaffId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
@@ -397,6 +402,27 @@
}
+ //鍒犻櫎浠诲姟
+ public boolean deleteTask(@RequestBody PurchaseApplyPo purchaseApplyPo) {
+ TaskService taskService = processEngine.getTaskService();
+
+ TaskQuery query = taskService.createTaskQuery().processInstanceBusinessKey(purchaseApplyPo.getApplyOrderId());
+ 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;
+ }
public ProcessEngine getProcessEngine() {
return processEngine;
--
Gitblit v1.8.0