From c17c4687562d61a5663510ae7fbd0ce7ce73873f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 16 五月 2021 12:18:58 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/smo/impl/PurchaseApplyUserInnerServiceSMOImpl.java | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 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
old mode 100644
new mode 100755
index c1b1292..8936e2c
--- 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,22 +2,20 @@
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IAuditUserInnerServiceSMO;
-import com.java110.core.smo.store.IComplaintInnerServiceSMO;
-import com.java110.core.smo.common.IPurchaseApplyUserInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.user.UserDto;
+import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
+import com.java110.intf.common.IAuditUserInnerServiceSMO;
+import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.store.IComplaintInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.engine.*;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.history.HistoricTaskInstanceQuery;
@@ -65,6 +63,10 @@
@Autowired
private IAuditUserInnerServiceSMO auditUserInnerServiceSMOImpl;
+ @Autowired
+ private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
+
/**
* 鍚姩娴佺▼
*
@@ -74,17 +76,36 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("purchaseApplyDto", purchaseApplyDto);
- variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
+ variables.put("nextAuditStaffId", purchaseApplyDto.getStaffId());
variables.put("userId", purchaseApplyDto.getCurrentUserId());
+ variables.put("startUserId", purchaseApplyDto.getCurrentUserId());
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("resourceEntry", purchaseApplyDto.getApplyOrderId(), variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(purchaseApplyDto.getStoreId()), purchaseApplyDto.getApplyOrderId(), variables);
// //灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// // System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
//
purchaseApplyDto.setProcessInstanceId(processInstanceId);
- autoFinishFirstTask(purchaseApplyDto);
+ //autoFinishFirstTask(purchaseApplyDto);
return purchaseApplyDto;
+ }
+
+
+ private String getWorkflowDto(String storeId) {
+ //寮�鍚祦绋�
+ //WorkflowDto.DEFAULT_PROCESS + workflowDto.getFlowId()
+ WorkflowDto workflowDto = new WorkflowDto();
+ workflowDto.setFlowType(WorkflowDto.FLOW_TYPE_PURCHASE);
+ workflowDto.setStoreId(storeId);
+ List<WorkflowDto> workflowDtos = workflowInnerServiceSMOImpl.queryWorkflows(workflowDto);
+
+ Assert.listOnlyOne(workflowDtos, "鏈壘鍒� 鎶曡瘔寤鸿娴佺▼鎴栨壘鍒板鏉★紝璇峰湪鐗╀笟璐﹀彿绯荤粺绠＄悊涓嬫祦绋嬬鐞嗕腑閰嶇疆娴佺▼");
+
+ WorkflowDto tmpWorkflowDto = workflowDtos.get(0);
+ if (StringUtil.isEmpty(tmpWorkflowDto.getProcessDefinitionKey())) {
+ throw new IllegalArgumentException("閲囪喘娴佺▼杩樻湭閮ㄧ讲");
+ }
+ return WorkflowDto.DEFAULT_PROCESS + tmpWorkflowDto.getFlowId();
}
/**
@@ -117,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();
}
@@ -129,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();
@@ -186,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");
@@ -253,12 +274,9 @@
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", purchaseApplyDto.getAuditCode());
variables.put("currentUserId", purchaseApplyDto.getCurrentUserId());
- variables.put("nextAuditStaffId",purchaseApplyDto.getStaffId());
- //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
- //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
- //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
+ variables.put("flag", "1200".equals(purchaseApplyDto.getAuditCode()) ? "false" : "true");
+ variables.put("startUserId", purchaseApplyDto.getStartUserId());
taskService.complete(purchaseApplyDto.getTaskId(), variables);
- //taskService.setVariable(purchaseApplyDto.getTaskId(), "purchaseApplyDto", purchaseApplyDto);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
if (pi == null) {
@@ -322,7 +340,6 @@
return purchaseApplyDto;
}
-
public ProcessEngine getProcessEngine() {
--
Gitblit v1.8.0