From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 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 59b683d..4b874f8 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
@@ -2,12 +2,12 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
-import com.java110.dto.auditMessage.AuditMessageDto;
-import com.java110.dto.businessDatabus.CustomBusinessDatabusDto;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.audit.AuditMessageDto;
+import com.java110.dto.data.DatabusDataDto;
+import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.dto.user.UserDto;
-import com.java110.dto.workflow.WorkflowDto;
-import com.java110.entity.audit.AuditUser;
+import com.java110.dto.oaWorkflow.WorkflowDto;
+import com.java110.dto.audit.AuditUser;
import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.job.IDataBusInnerServiceSMO;
@@ -15,6 +15,7 @@
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
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 +77,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
@@ -100,7 +103,7 @@
machineRecordPo.setPurchaseUserId(actRuTaskUserId);
machineRecordPo.setResOrderType(resOrderType);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
@@ -118,7 +121,7 @@
workflowDto.setStoreId(storeId);
List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
- Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鎶曡瘔寤鸿娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
+ Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 閲囪喘娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {
@@ -306,6 +309,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) {
@@ -332,7 +336,7 @@
machineRecordPo.setResOrderType(resOrderType);
machineRecordPo.setAuditMessage(auditMessage);
//浼犻�乨atabus
- dataBusInnerServiceSMOImpl.customExchange(CustomBusinessDatabusDto.getInstance(
+ dataBusInnerServiceSMOImpl.databusData(DatabusDataDto.getInstance(
BusinessTypeConstant.BUSINESS_TYPE_DATABUS_PURCHASE_APPLY, BeanConvertUtil.beanCovertJson(machineRecordPo)));
}
}
@@ -397,6 +401,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