|
@@ -150,22 +150,15 @@ public class TaskServiceImpl extends BaseService implements TaskService {
|
|
|
Set<Long> workerIds = new HashSet<>();
|
|
Set<Long> workerIds = new HashSet<>();
|
|
|
// Assign Task to workers
|
|
// Assign Task to workers
|
|
|
for (Long groupId : groupIds) {
|
|
for (Long groupId : groupIds) {
|
|
|
- List<Worker> workers = groupService.getWorkersByGroupId(groupId);
|
|
|
|
|
- for (Worker worker : workers) {
|
|
|
|
|
- if (workerIds.contains(worker.getId())) {
|
|
|
|
|
|
|
+ List<User> users = groupService.getUsersByGroupId(groupId);
|
|
|
|
|
+ for (User user : users) {
|
|
|
|
|
+ if (workerIds.contains(user.getId())) {
|
|
|
continue;
|
|
continue;
|
|
|
} else {
|
|
} else {
|
|
|
- workerIds.add(worker.getId());
|
|
|
|
|
|
|
+ workerIds.add(user.getId());
|
|
|
}
|
|
}
|
|
|
- AssignedTask assignedTask = buildAssignedTask(task, worker.getId(), caseBlocks, caseMap, subjectMap,
|
|
|
|
|
|
|
+ AssignedTask assignedTask = buildAssignedTask(task, user.getId(), caseBlocks, caseMap, subjectMap,
|
|
|
subsiteMap);
|
|
subsiteMap);
|
|
|
- List<AssignedCase> assignedCases = assignedTaskService.getAssignedCases(assignedTask);
|
|
|
|
|
- List<Long> assignedCaseIds = assignedCases.stream().map(AssignedCase::getCaseId).
|
|
|
|
|
- collect(Collectors.toList());
|
|
|
|
|
- for (Long assignedCaseId : assignedCaseIds) {
|
|
|
|
|
- String taskCaseKey = task.getId() + "_" + assignedCaseId;
|
|
|
|
|
- caseCountMap.put(taskCaseKey, caseCountMap.getOrDefault(taskCaseKey, 0) + 1);
|
|
|
|
|
- }
|
|
|
|
|
assignedTasks.add(assignedTask);
|
|
assignedTasks.add(assignedTask);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|