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/ResourceEntryStoreInnerServiceSMOImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
index 4ff7f35..51ae80b 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java
@@ -2,12 +2,16 @@
import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.workflow.WorkflowDto;
import com.java110.intf.common.IResourceEntryStoreInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.resourceStore.ResourceOrderDto;
import com.java110.entity.audit.AuditUser;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.TaskService;
@@ -39,6 +43,9 @@
@Autowired
private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+ @Autowired
+ private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
/**
* 鍚姩娴佺▼
@@ -49,8 +56,9 @@
//灏嗕俊鎭姞鍏ap,浠ヤ究浼犲叆娴佺▼涓�
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("resourceOrderDto", resourceOrderDto);
+
//寮�鍚祦绋�
- ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("resourceEntry", variables);
+ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(resourceOrderDto.getStoreId()), variables);
//灏嗗緱鍒扮殑瀹炰緥娴佺▼id鍊艰祴缁欎箣鍓嶈缃殑鍙橀噺
String processInstanceId = processInstance.getId();
// System.out.println("娴佺▼寮�鍚垚鍔�.......瀹炰緥娴佺▼id:" + processInstanceId);
@@ -68,7 +76,7 @@
*/
public long getUserTaskCount(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEntry");
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
query.taskAssignee(user.getUserId());
return query.count();
}
@@ -80,7 +88,7 @@
*/
public List<PurchaseApplyDto> getUserTasks(@RequestBody AuditUser user) {
TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("resourceEntry");
+ TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getStoreId()));
query.taskAssignee(user.getUserId());
query.orderByTaskCreateTime().desc();
List<Task> list = null;
@@ -159,8 +167,28 @@
TaskService taskService = processEngine.getTaskService();
taskService.complete(resourceOrderDto.getTaskId());
+
+
return true;
}
+
+ 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();
+ }
+
}
--
Gitblit v1.8.0