|
@@ -1347,12 +1347,16 @@ public class WmTaskController {
|
|
|
selectItemMap.putAll(selectItemList.stream().collect(Collectors.groupingBy(SysDictItem::getType)));
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ // task用户名称
|
|
|
+ List<SysUser> userList = sysUserService.listByIds(taskList.stream().map(WmTask::getTaskUserId).collect(Collectors.toSet()));
|
|
|
+ Map<Integer, String> userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
|
|
|
|
|
|
taskList.forEach(wmTask -> {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
wmTask.setTaskTypeName(taskTypeNameMap.get(wmTask.getTaskTypeId()));
|
|
|
map.put("taskType", wmTask.getTaskTypeId());
|
|
|
+ map.put("score", wmTask.getScore());
|
|
|
+ map.put("taskUserName", userMap.get(Integer.parseInt(wmTask.getTaskUserId())));
|
|
|
map.put("taskInfo", wmTask);
|
|
|
|
|
|
WmTaskContent wmTaskContent = taskContentMap.get(Integer.parseInt(wmTask.getTaskContentId()));
|