From dd0a331654e90b6584354e32d80b5b94206d609f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 01 八月 2020 16:06:16 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/ComplaintUserInnerServiceSMOImpl.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 dac1e07..4a3d6d9 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
@@ -2,10 +2,10 @@
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.common.IComplaintUserInnerServiceSMO;
-import com.java110.core.smo.common.IWorkflowInnerServiceSMO;
-import com.java110.core.smo.store.IComplaintInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.common.IComplaintUserInnerServiceSMO;
+import com.java110.intf.common.IWorkflowInnerServiceSMO;
+import com.java110.intf.store.IComplaintInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.auditMessage.AuditMessageDto;
import com.java110.dto.complaint.ComplaintDto;
@@ -260,6 +260,8 @@
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("auditCode", complaintDto.getAuditCode());
variables.put("currentUserId", complaintDto.getCurrentUserId());
+ variables.put("flag", "1200".equals(complaintDto.getAuditCode()) ? "false" : "true");
+ variables.put("startUserId", complaintDto.getStartUserId());
//taskService.setAssignee(complaintDto.getTaskId(),complaintDto.getCurrentUserId());
//taskService.addCandidateUser(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
//taskService.claim(complaintDto.getTaskId(), complaintDto.getCurrentUserId());
@@ -302,28 +304,37 @@
public ComplaintDto getTaskCurrentUser(@RequestBody ComplaintDto complaintDto) {
TaskService taskService = processEngine.getTaskService();
- Task task = taskService.createTaskQuery().processInstanceBusinessKey(complaintDto.getComplaintId()).singleResult();
+ List<Task> tasks = taskService.createTaskQuery().processInstanceBusinessKey(complaintDto.getComplaintId()).list();
- if (task == null) {
+ if (tasks == null || tasks.size() == 0) {
complaintDto.setCurrentUserId("");
complaintDto.setCurrentUserName("");
complaintDto.setCurrentUserTel("");
return complaintDto;
}
-
- String userId = task.getAssignee();
- List<UserDto> users = userInnerServiceSMOImpl.getUserInfo(new String[]{userId});
-
- if (users == null || users.size() == 0) {
- complaintDto.setCurrentUserId("");
- complaintDto.setCurrentUserName("");
- complaintDto.setCurrentUserTel("");
- return complaintDto;
+ 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;
+ }
+ userIds += (userId + "/");
+ userNames += (users.get(0).getName() + "/");
+ userTels += (users.get(0).getTel() + "/");
}
-
- complaintDto.setCurrentUserId(userId);
- complaintDto.setCurrentUserName(users.get(0).getName());
- complaintDto.setCurrentUserTel(users.get(0).getTel());
+ 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