feat: 结算报告审批-查看操作人回显

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -1081,6 +1081,17 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 		if(CollUtil.isNotEmpty(taskList)) {
 			List<WmScorePackage> taskScorePackages = wmScorePackageService.listByIds(taskList.stream().map(WmTask::getScorePackageId).collect(Collectors.toSet()));
 			Map<String, WmScorePackage> scorePackageMap = taskScorePackages.stream().collect(Collectors.toMap(WmScorePackage::getId, Function.identity()));
+
+			// 查询审核人用户信息
+			Set<Integer> approvalUserIds = taskList.stream()
+					.filter(r -> r.getDeptApprovalUserId() != null)
+					.map(WmTask::getDeptApprovalUserId).collect(Collectors.toSet());
+			Map<Integer, String> userMap = new HashMap<>();
+			if (CollUtil.isNotEmpty(approvalUserIds)) {
+				List<SysUser> users = sysUserService.listByIds(approvalUserIds);
+				userMap.putAll(users.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname)));
+			}
+
 			List<Map> resList =taskList.stream().map(wmtask -> {
 				Map map = JSON.parseObject(JSON.toJSONString(wmtask), Map.class);
 				map.put("reportNo",wmReport.getReportNo());
@@ -1111,20 +1122,15 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 					}
 				}
 				map.put("scorePackageStatus", scorePackageMap.getOrDefault(wmtask.getScorePackageId(), new WmScorePackage()).getScorePackageStatus());
+
+				if (wmtask.getDeptApprovalUserId() != null) {
+					map.put("deptApprovalUserName", userMap.get(wmtask.getDeptApprovalUserId()));
+				}
+
 				return map;
 			}).collect(Collectors.toList());
 
-			// 查询审核人用户信息
-			Set<Integer> approvalUserIds = taskList.stream()
-					.filter(r -> r.getApprovalUserId() != null)
-					.map(WmTask::getApprovalUserId).collect(Collectors.toSet());
-			if (CollUtil.isNotEmpty(approvalUserIds)) {
-				List<SysUser> users = sysUserService.listByIds(approvalUserIds);
-				Map<Integer, String> userMap = users.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
-				taskList.stream()
-						.filter(r -> r.getDeptApprovalUserId() != null)
-						.forEach(r -> r.setDeptApprovalUserName(userMap.get(r.getDeptApprovalUserId())));
-			}
+
 
 			page.setRecords(resList);
 		}