From 138d5f087e386c657d964e4e4c2b8ac65038e085 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 二月 2021 14:47:06 +0800
Subject: [PATCH] 优化 考勤任务上报
---
service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
index e2b54f0..d3fb3e3 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/GoodCollectionUserInnerServiceSMOImpl.java
@@ -222,11 +222,12 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey(getWorkflowDto(user.getStoreId()))
- .taskAssignee(user.getUserId());
+ .taskAssignee(user.getUserId())
+ .finished();
if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnter");
+ historicTaskInstanceQuery.taskName("complaint");
} else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnterDealUser");
+ historicTaskInstanceQuery.taskName("complaitDealUser");
}
Query query = historicTaskInstanceQuery;
@@ -242,13 +243,14 @@
HistoryService historyService = processEngine.getHistoryService();
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .processDefinitionKey("resourceEnter")
- .taskAssignee(user.getUserId());
- if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnter");
- } else if (!StringUtil.isEmpty(user.getAuditLink()) && "AUDIT".equals(user.getAuditLink())) {
- historicTaskInstanceQuery.taskName("resourceEnterDealUser");
- }
+ .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();
@@ -259,23 +261,29 @@
list = query.list();
}
- List<String> complaintIds = new ArrayList<>();
+ 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();
- complaintIds.add(business_key);
+ applyOrderIds.add(business_key);
+ taskBusinessKeyMap.put(business_key, task.getId());
}
//鏌ヨ 鎶曡瘔淇℃伅
-// ComplaintDto complaintDto = new ComplaintDto();
-// complaintDto.setStoreId(user.getStoreId());
-// complaintDto.setCommunityId(user.getCommunityId());
-// complaintDto.setComplaintIds(complaintIds.toArray(new String[complaintIds.size()]));
-// List<ComplaintDto> tmpComplaintDtos = complaintInnerServiceSMOImpl.queryComplaints(complaintDto);
- return null;
+ 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