fix: 任务中心-查看加scorePackageName

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

@@ -204,16 +204,20 @@ public class WmTaskController {
 	 */
 	@GetMapping("/pageSum")
 	public R pageSum(Page page, WmTask wmTask) {
+		List<WmScorePackage> allScorePackageList = new ArrayList<>();
+
 		WmScorePackage wmScorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
+		allScorePackageList.add(wmScorePackage);
+
 		wmScorePackage.setRelationScoreId(wmScorePackage.getId());
 		List<WmScorePackage> wmScorePackageList = wmScorePackageService.selectLists(wmScorePackage);
 		List<WmTask> list = new ArrayList<>();
 		if (wmScorePackageList.size() > 0) {
+			allScorePackageList.addAll(wmScorePackageList);
+
 			WmTask wmTask3 = new WmTask();
 			wmTask3.setScorePackageId(wmScorePackage.getId());
 			List<WmTask> wmTaskList3 = wmTaskMapper.selectListByIds(wmTask3);
-			// 回显积分包名称
-			wmTaskList3.forEach(task -> task.setScorePackageName(wmScorePackage.getScorePackageName()));
 
 			list.addAll(wmTaskList3);
 
@@ -221,21 +225,19 @@ public class WmTaskController {
 				WmScorePackage wmScorePackage1 = new WmScorePackage();
 				wmScorePackage1.setRelationScoreId(subScorePackage.getId());
 				List<WmScorePackage> wmScorePackageList1 = wmScorePackageService.selectLists(wmScorePackage1);
+				allScorePackageList.addAll(wmScorePackageList1);
+
 				WmTask wmTask1 = new WmTask();
 				wmTask1.setScorePackageId(subScorePackage.getId());
 				List<WmTask> wmTaskList = wmTaskMapper.selectListByIds(wmTask1);
-				// 回显积分包名称
-				wmTaskList.forEach(task -> task.setScorePackageName(subScorePackage.getScorePackageName()));
 
 				List<String> ids3 = wmTaskList.stream().map(p -> p.getId()).collect(Collectors.toList());
-				List<String> ids4 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+
 				if (wmScorePackageList1.size() > 0) {
 					for (WmScorePackage subSubScorePackage : wmScorePackageList1) {
 						WmTask wmTask2 = new WmTask();
 						wmTask2.setScorePackageId(subSubScorePackage.getId());
 						List<WmTask> wmTaskList1 = wmTaskMapper.selectListByIds(wmTask2);
-						// 回显积分包名称
-						wmTaskList1.forEach(task -> task.setScorePackageName(subSubScorePackage.getScorePackageName()));
 
 						List<String> ids5 = wmTaskList1.stream().map(p -> p.getId()).collect(Collectors.toList());
 						for (String id2 : ids5) {
@@ -253,8 +255,6 @@ public class WmTaskController {
 			WmTask wmTask1 = new WmTask();
 			wmTask1.setScorePackageId(wmScorePackage.getId());
 			List<WmTask> wmTaskList1 = wmTaskMapper.selectListByIds(wmTask1);
-			// 回显积分包名称
-			wmTaskList1.forEach(task -> task.setScorePackageName(wmScorePackage.getScorePackageName()));
 
 			list.addAll(wmTaskList1);
 		}
@@ -267,7 +267,15 @@ public class WmTaskController {
 		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()))));
+		// 所有积分包对应map
+		Map<String, String> packageMap = allScorePackageList.stream().collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getScorePackageName));
+
+		list.forEach(task -> {
+			// 回显承接人名称
+			task.setTaskUsername(userMap.get(Integer.parseInt(task.getTaskUserId())));
+			// 回显积分包名称
+			task.setScorePackageName(packageMap.get(task.getScorePackageId()));
+		});
 
 		//每页数据条数
 		Page<WmTask> page1 = new Page<>();