From 9943c60aca4c93600e54479d919d377e08a12ef4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 21:58:26 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
index dd2bd51..510297e 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java
@@ -194,7 +194,8 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey(getWorkflowDto(user.getCommunityId()))
- .taskAssignee(user.getUserId());
+ .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())) {
@@ -202,6 +203,7 @@
}
Query query = historicTaskInstanceQuery;
+
return query.count();
}
@@ -215,7 +217,8 @@
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processDefinitionKey(getWorkflowDto(user.getCommunityId()))
- .taskAssignee(user.getUserId());
+ .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())) {
@@ -315,8 +318,10 @@
String userIds = "";
String userNames = "";
String userTels = "";
+ String taskIds = "";
for (Task task : tasks) {
String userId = task.getAssignee();
+ taskIds += (task.getId() + "/");
List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
if (users == null || users.size() == 0) {
continue;
@@ -328,9 +333,11 @@
userIds = userIds.endsWith("/") ? userIds.substring(0, userIds.length() - 1) : userIds;
userNames = userNames.endsWith("/") ? userNames.substring(0, userNames.length() - 1) : userNames;
userTels = userTels.endsWith("/") ? userTels.substring(0, userTels.length() - 1) : userTels;
+ taskIds = taskIds.endsWith("/") ? taskIds.substring(0, taskIds.length() - 1) : taskIds;
complaintDto.setCurrentUserId(userIds);
complaintDto.setCurrentUserName(userNames);
complaintDto.setCurrentUserTel(userTels);
+ complaintDto.setTaskId(taskIds);
return complaintDto;
}
--
Gitblit v1.8.0