From 23fe00a4007106b2349eed5554a4a67228b480dd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 05 十一月 2019 14:00:40 +0800
Subject: [PATCH] 查询审核过的记录
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java b/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
index 659a74f..afa9cb9 100644
--- a/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
+++ b/CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
@@ -10,10 +10,15 @@
import com.java110.dto.complaint.ComplaintDto;
import com.java110.entity.audit.AuditUser;
import com.java110.utils.util.Assert;
+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.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.identity.Authentication;
+import org.activiti.engine.query.Query;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.Comment;
import org.activiti.engine.task.Task;
@@ -69,17 +74,17 @@
/**
* 鑷姩鎻愪氦绗竴姝�
*/
- private void autoFinishFirstTask(ComplaintDto complaintDto){
+ private void autoFinishFirstTask(ComplaintDto complaintDto) {
Task task = null;
TaskQuery query = taskService.createTaskQuery().taskCandidateOrAssigned(complaintDto.getCurrentUserId()).active();
List<Task> todoList = query.list();//鑾峰彇鐢宠浜虹殑寰呭姙浠诲姟鍒楄〃
for (Task tmp : todoList) {
- if(tmp.getProcessInstanceId().equals(complaintDto.getProcessInstanceId())){
+ if (tmp.getProcessInstanceId().equals(complaintDto.getProcessInstanceId())) {
task = tmp;//鑾峰彇褰撳墠娴佺▼瀹炰緥锛屽綋鍓嶇敵璇蜂汉鐨勫緟鍔炰换鍔�
break;
}
}
- Assert.notNull(task, "鏈壘鍒板綋鍓嶇敤鎴蜂换鍔serId = "+ complaintDto.getCurrentUserId());
+ Assert.notNull(task, "鏈壘鍒板綋鍓嶇敤鎴蜂换鍔serId = " + complaintDto.getCurrentUserId());
complaintDto.setTaskId(task.getId());
complaintDto.setAuditCode("10000");
complaintDto.setAuditMessage("鎻愪氦");
@@ -113,16 +118,79 @@
query.orderByTaskCreateTime().desc();
List<Task> list = null;
if (user.getPage() != PageDto.DEFAULT_PAGE) {
+ list = query.listPage((user.getPage() - 1) * user.getRow(), user.getRow());
+ } else {
+ list = query.list();
+ }
+
+ List<String> complaintIds = new ArrayList<>();
+ Map<String, String> taskBusinessKeyMap = new HashMap<>();
+ for (Task task : list) {
+ String processInstanceId = task.getProcessInstanceId();
+ //3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
+ ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ //4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
+ String business_key = pi.getBusinessKey();
+ complaintIds.add(business_key);
+ taskBusinessKeyMap.put(business_key, task.getId());
+ }
+
+ if (complaintIds == null || complaintIds.size() == 0) {
+ return new ArrayList<>();
+ }
+
+ //鏌ヨ 鎶曡瘔淇℃伅
+ 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);
+
+ for (ComplaintDto tmpComplaintDto : tmpComplaintDtos) {
+ tmpComplaintDto.setTaskId(taskBusinessKeyMap.get(tmpComplaintDto.getComplaintId()));
+ }
+ return tmpComplaintDtos;
+ }
+
+
+ /**
+ * 鏌ヨ鐢ㄦ埛浠诲姟鏁�
+ *
+ * @param user
+ * @return
+ */
+ public long getUserHistoryTaskCount(@RequestBody AuditUser user) {
+ HistoryService historyService = processEngine.getHistoryService();
+ Query query = historyService.createHistoricTaskInstanceQuery()
+ .processDefinitionKey("complaint")
+ .taskAssignee(user.getUserId());
+ return query.count();
+ }
+ /**
+ * 鑾峰彇鐢ㄦ埛瀹℃壒鐨勪换鍔�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ */
+ public List<ComplaintDto> getUserHistoryTasks(@RequestBody AuditUser user) {
+ HistoryService historyService = processEngine.getHistoryService();
+ Query query = historyService.createHistoricTaskInstanceQuery()
+ .processDefinitionKey("complaint")
+ .taskAssignee(user.getUserId())
+ .orderByHistoricTaskInstanceStartTime()
+ .desc();
+
+ List<HistoricTaskInstance> list = null;
+ if (user.getPage() != PageDto.DEFAULT_PAGE) {
list = query.listPage(user.getPage(), user.getRow());
} else {
list = query.list();
}
List<String> complaintIds = new ArrayList<>();
- for (Task task : list) {
+ for (HistoricTaskInstance task : list) {
String processInstanceId = task.getProcessInstanceId();
//3.浣跨敤娴佺▼瀹炰緥锛屾煡璇�
- ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ HistoricProcessInstance pi = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
//4.浣跨敤娴佺▼瀹炰緥瀵硅薄鑾峰彇BusinessKey
String business_key = pi.getBusinessKey();
complaintIds.add(business_key);
@@ -131,11 +199,13 @@
//鏌ヨ 鎶曡瘔淇℃伅
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 tmpComplaintDtos;
}
+
public boolean completeTask(@RequestBody ComplaintDto complaintDto) {
TaskService taskService = processEngine.getTaskService();
Task task = taskService.createTaskQuery().taskId(complaintDto.getTaskId()).singleResult();
--
Gitblit v1.8.0