From ca45754a14606973f06b56b4003fc891831f06e8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 29 二月 2020 16:29:54 +0800
Subject: [PATCH] 优化审核功能
---
CommonService/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 12 +++++++-----
1 files changed, 7 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 eb69179..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
@@ -167,10 +167,11 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("complaint")
- .taskAssignee(user.getUserId())
- .orderByHistoricTaskInstanceStartTime();
+ .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;
@@ -187,13 +188,14 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey("complaint")
- .taskAssignee(user.getUserId())
- .orderByHistoricTaskInstanceStartTime();
+ .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.desc();
+ Query query = historicTaskInstanceQuery.orderByHistoricTaskInstanceStartTime().desc();
List<HistoricTaskInstance> list = null;
if (user.getPage() != PageDto.DEFAULT_PAGE) {
--
Gitblit v1.8.0