From b3c79c2addbccedef3eb29c2befe77803bfd106b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 03 二月 2020 17:06:54 +0800
Subject: [PATCH] 优化收费汇总
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 1ab1b03..cefd7b8 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
@@ -4,16 +4,19 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.core.smo.complaint.IComplaintInnerServiceSMO;
import com.java110.core.smo.complaintUser.IComplaintUserInnerServiceSMO;
-import com.java110.dto.FeeDto;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
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.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;
@@ -147,29 +150,46 @@
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) {
- TaskService taskService = processEngine.getTaskService();
- TaskQuery query = taskService.createTaskQuery().processDefinitionKey("complaint");
- ;
- query.taskAssignee(user.getUserId());
- query.orderByTaskCreateTime().desc();
- List<Task> list = null;
+ 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());
+ list = query.listPage((user.getPage() - 1) * user.getRow(), 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);
@@ -193,6 +213,10 @@
taskService.addComment(complaintDto.getTaskId(), processInstanceId, complaintDto.getAuditMessage());
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", complaintDto.getAuditCode());
+ variables.put("currentUserId", complaintDto.getCurrentUserId());
+ //taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
+ //taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
+ //taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
taskService.complete(complaintDto.getTaskId(), variables);
ProcessInstance pi = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
--
Gitblit v1.8.0