From fdd79c10325b5e3241931788f354b0163b8f0cfe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 01 四月 2021 01:03:24 +0800
Subject: [PATCH] 加入合同审批功能
---
service-common/src/main/java/com/java110/common/smo/impl/ResourceEntryStoreInnerServiceSMOImpl.java | 125 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 8 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 77b4b03..2462352 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,15 +2,24 @@
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IResourceEntryStoreInnerServiceSMO;
-import com.java110.core.smo.store.IPurchaseApplyInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.resourceStore.ResourceOrderDto;
+import com.java110.dto.workflow.WorkflowDto;
import com.java110.entity.audit.AuditUser;
+import com.java110.intf.common.IResourceEntryStoreInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
+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.RuntimeService;
import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.query.Query;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Task;
import org.activiti.engine.task.TaskQuery;
@@ -39,6 +48,9 @@
@Autowired
private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+ @Autowired
+ private IWorkflowInnerServiceSMO workflowInnerServiceSMOImpl;
+
/**
* 鍚姩娴佺▼
@@ -49,8 +61,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 +81,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,16 +93,16 @@
*/
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;
- if(user.getPage() >=1){
- user.setPage(user.getPage()-1);
+ if (user.getPage() >= 1) {
+ user.setPage(user.getPage() - 1);
}
if (user.getPage() != PageDto.DEFAULT_PAGE) {
list = query.listPage(user.getPage(), user.getRow());
- }else{
+ } else {
list = query.list();
}
@@ -159,8 +172,104 @@
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();
+ }
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浠诲姟鏁�
+ *
+ * @param user
+ * @return
+ */
+ public long getUserHistoryTaskCount(@RequestBody AuditUser user) {
+ HistoryService historyService = processEngine.getHistoryService();
+// Query query = historyService.createHistoricTaskInstanceQuery()
+// .processDefinitionKey("complaint")
+// .taskAssignee(user.getUserId());
+
+ HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+ .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .taskAssignee(user.getUserId())
+ .finished();
+ if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
+ historicTaskInstanceQuery.taskName("complaint");
+ } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
+ historicTaskInstanceQuery.taskName("complaitDealUser");
+ }
+
+ Query query = historicTaskInstanceQuery;
+ return query.count();
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛瀹℃壒鐨勪换鍔�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ */
+ public List<PurchaseApplyDto> getUserHistoryTasks(@RequestBody AuditUser user) {
+ HistoryService historyService = processEngine.getHistoryService();
+
+ HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
+ .processDefinitionKey(getWorkflowDto(user.getStoreId()))
+ .taskAssignee(user.getUserId())
+ .finished();
+// if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
+// historicTaskInstanceQuery.taskName("complaint");
+// } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
+// historicTaskInstanceQuery.taskName("complaitDealUser");
+// }
+
+ Query query = historicTaskInstanceQuery.orderByHistoricTaskInstanceStartTime().desc();
+
+ List<HistoricTaskInstance> list = null;
+ if (user.getPage() != PageDto.DEFAULT_PAGE) {
+ list = query.listPage((user.getPage() - 1) * user.getRow(), user.getRow());
+ } else {
+ list = query.list();
+ }
+
+ List<String> applyOrderIds = new ArrayList<>();
+ Map<String, String> taskBusinessKeyMap = new HashMap<>();
+
+ for (HistoricTaskInstance task : list) {
+ String processInstanceId = task.getProcessInstanceId();
+ //3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
+ HistoricProcessInstance pi = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ //4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
+ String business_key = pi.getBusinessKey();
+ applyOrderIds.add(business_key);
+ taskBusinessKeyMap.put(business_key, task.getId());
+ }
+
+ //鏌ヨ 鎶曡瘔淇℃伅
+ PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+ purchaseApplyDto.setStoreId(user.getStoreId());
+ purchaseApplyDto.setApplyOrderIds(applyOrderIds.toArray(new String[applyOrderIds.size()]));
+ List<PurchaseApplyDto> tmpPurchaseApplyDtos = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplyAndDetails(purchaseApplyDto);
+
+ for (PurchaseApplyDto tmpPurchaseApplyDto : tmpPurchaseApplyDtos) {
+ tmpPurchaseApplyDto.setTaskId(taskBusinessKeyMap.get(tmpPurchaseApplyDto.getApplyOrderId()));
+ }
+ return tmpPurchaseApplyDtos;
+ }
+
}
--
Gitblit v1.8.0