From 7207e75881349b2a4c8abbb67b27c4a07381f4c3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 14 七月 2020 19:09:54 +0800
Subject: [PATCH] 优化采购申请功能
---
service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 5a935d1..aad212f 100644
--- 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
@@ -78,6 +78,7 @@
variables.put("purchaseApplyDto", purchaseApplyDto);
variables.put("nextAuditStaffId", purchaseApplyDto.getStaffId());
variables.put("userId", purchaseApplyDto.getCurrentUserId());
+ variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
//寮�鍚祦绋�
ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
// //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
@@ -137,7 +138,7 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEnter");
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -149,7 +150,7 @@
*/
public List<PurchaseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEnter");
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
;
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
@@ -206,7 +207,7 @@
// .taskAssignee(user.getUserId());
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey("resourceEnter")
+ .processDefinitionKey(getWorkflowDto(user.getStoreId()))
.taskAssignee(user.getUserId());
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
historicTaskInstanceQuery.taskName("resourceEnter");
@@ -275,11 +276,7 @@
variables.put("currentUserId", purchaseApplyDto.getCurrentUserId());
variables.put("flag", "1200".equals(purchaseApplyDto.getAuditCode()) ? "false" : "true");
variables.put("startUserId", purchaseApplyDto.getStartUserId());
- //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
- //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
- //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
- //taskService.setVariable(purchaseApplyDto.getTaskId(), "purchaseApplyDto", purchaseApplyDto);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
--
Gitblit v1.8.0