From 0918437099f43349f49de66cda2fdefc7a27d978 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 三月 2020 14:04:08 +0800
Subject: [PATCH] 调整 readme
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 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 cefd7b8..7988ec5 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
@@ -9,12 +9,14 @@
import com.java110.dto.complaint.ComplaintDto;
import com.java110.entity.audit.AuditUser;
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.impl.identity.Authentication;
import org.activiti.engine.query.Query;
import org.activiti.engine.runtime.ProcessInstance;
@@ -159,9 +161,20 @@
*/
public long getUserHistoryTaskCount(@RequestBody AuditUser user) {
HistoryService historyService = processEngine.getHistoryService();
- Query query = historyService.createHistoricTaskInstanceQuery()
+// Query query = historyService.createHistoricTaskInstanceQuery()
+// .processDefinitionKey("complaint")
+// .taskAssignee(user.getUserId());
+
+ HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("complaint")
.taskAssignee(user.getUserId());
+ 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();
}
@@ -172,11 +185,17 @@
*/
public List<ComplaintDto> getUserHistoryTasks(@RequestBody AuditUser user) {
HistoryService historyService = processEngine.getHistoryService();
- Query query = historyService.createHistoricTaskInstanceQuery()
+
+ HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("complaint")
- .taskAssignee(user.getUserId())
- .orderByHistoricTaskInstanceStartTime()
- .desc();
+ .taskAssignee(user.getUserId()) ;
+ 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) {
--
Gitblit v1.8.0