fix: 任务中心-查看姓名返回中文

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDeptTaskController.java

@@ -127,34 +127,52 @@ public class WmDeptTaskController {
 				.eq(WmTask::getEnableFlag, EnableEnum.ENABLE.val())
 				.eq(WmTask::getTaskStatus, TaskStatusEnum.APPROVED.val()));
 
-		// 全职分值
-		result.put("full_time_task_score", String.valueOf(taskList.stream().mapToInt(WmTask::getScore).sum()));
-		// 全职任务数
-		result.put("full_time_task_number", String.valueOf(taskList.size()));
-
-		List<WmTask> personalTask = taskList.stream()
-				.filter(task -> personalTaskTypeIds.contains(task.getTaskTypeId()))
-				.collect(Collectors.toList());
+		// 给个默认值
 		// 个人任务分值
-		result.put("personal_task_score", String.valueOf(personalTask.stream().mapToInt(WmTask::getScore).sum()));
+		result.put("personal_task_score", "0");
 		// 个人任务条数
-		result.put("personal_task_number", String.valueOf(personalTask.size()));
-		List<WmTask> p19TaskList = taskList.stream()
-				.filter(task -> p19TaskTypeIds.contains(task.getTaskTypeId()))
-				.collect(Collectors.toList());
-
+		result.put("personal_task_number", "0");
+		// 全职分值
+		result.put("full_time_task_score", "0");
+		// 全职任务数
+		result.put("full_time_task_number", "0");
 		// 招商经理任务分值
-		result.put("investment_manager_task_score", String.valueOf(p19TaskList.stream().mapToInt(WmTask::getScore).sum()));
+		result.put("investment_manager_task_score", "0");
 		// 招商经理任务条数
-		result.put("investment_manager_task_number", String.valueOf(p19TaskList.size()));
-
-		List<WmTask> entTaskList = taskList.stream()
-				.filter(task -> entTaskTypeIds.contains(task.getTaskTypeId()))
-				.collect(Collectors.toList());
-		// 企业任务分值
-		result.put("ent_task_score", String.valueOf(entTaskList.stream().mapToInt(WmTask::getScore).sum()));
-		// 企业任务条数
-		result.put("ent_task_number", String.valueOf(entTaskList.size()));
+		result.put("investment_manager_task_number", "0");
+
+		if ("3".equals(scorePackage.getTypeid())) {
+			// 全职任务
+			// 全职分值
+			result.put("full_time_task_score", String.valueOf(taskList.stream().mapToInt(WmTask::getScore).sum()));
+			// 全职任务数
+			result.put("full_time_task_number", String.valueOf(taskList.size()));
+		} else {
+			// 非全职任务
+			List<WmTask> personalTask = taskList.stream()
+					.filter(task -> personalTaskTypeIds.contains(task.getTaskTypeId()))
+					.collect(Collectors.toList());
+			// 个人任务分值
+			result.put("personal_task_score", String.valueOf(personalTask.stream().mapToInt(WmTask::getScore).sum()));
+			// 个人任务条数
+			result.put("personal_task_number", String.valueOf(personalTask.size()));
+			List<WmTask> p19TaskList = taskList.stream()
+					.filter(task -> p19TaskTypeIds.contains(task.getTaskTypeId()))
+					.collect(Collectors.toList());
+
+			// 招商经理任务分值
+			result.put("investment_manager_task_score", String.valueOf(p19TaskList.stream().mapToInt(WmTask::getScore).sum()));
+			// 招商经理任务条数
+			result.put("investment_manager_task_number", String.valueOf(p19TaskList.size()));
+
+			List<WmTask> entTaskList = taskList.stream()
+					.filter(task -> entTaskTypeIds.contains(task.getTaskTypeId()))
+					.collect(Collectors.toList());
+			// 企业任务分值
+			result.put("ent_task_score", String.valueOf(entTaskList.stream().mapToInt(WmTask::getScore).sum()));
+			// 企业任务条数
+			result.put("ent_task_number", String.valueOf(entTaskList.size()));
+		}
 
 		// 审核管理费分值
 		int taskScoreSum = taskList.stream().mapToInt(WmTask::getScore).sum();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaskController.java

@@ -249,6 +249,14 @@ public class WmTaskController {
 			List<WmTask> wmTaskList1 = wmTaskMapper.selectListByIds(wmTask1);
 			list.addAll(wmTaskList1);
 		}
+
+		// 查询task包含的所有userId
+		Set<String> taskUserIds = list.stream().map(WmTask::getTaskUserId).collect(Collectors.toSet());
+		List<SysUser> userList = sysUserService.listByIds(taskUserIds);
+		Map<Integer, String> userMap = userList.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
+
+		list.forEach(task -> task.setTaskUsername(userMap.get(Integer.parseInt(task.getTaskUserId()))));
+
 		//每页数据条数
 		Page<WmTask> page1 = new Page<>();
 		int current = new Long(page.getCurrent()).intValue();