feat: 查询企业任务记录-积分包名称

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

@@ -110,6 +110,9 @@ public class WmDeptTaskController {
         }
         // 积分包id列表
         Set<String> packageIdSet = relatedPackages.stream().map(WmScorePackage::getId).collect(Collectors.toSet());
+        // 积分包名称map
+        Map<String, String> packageNameMap = relatedPackages.stream()
+                .collect(Collectors.toMap(WmScorePackage::getId, WmScorePackage::getScorePackageName));
 
         // 查询积分包下的企业任务
         Page<WmTask> taskPage = wmTaskService.page(new Page<>(page.getCurrent(), page.getSize()), Wrappers.<WmTask>lambdaQuery()
@@ -135,10 +138,12 @@ public class WmDeptTaskController {
 
         List<WmTaskVO> vos = taskPage.getRecords().stream().map(wmTask -> {
             WmTaskVO wmTaskVO = BeanUtil.copyProperties(wmTask, WmTaskVO.class);
+            // 积分包名称
+            wmTaskVO.setScorePackageName(packageNameMap.getOrDefault(wmTask.getScorePackageId(), ""));
             // 任务类型名称
-            wmTaskVO.setTaskTypeName(taskTypeIdMap.getOrDefault(wmTaskVO.getTaskTypeId(), ""));
+            wmTaskVO.setTaskTypeName(taskTypeIdMap.getOrDefault(wmTask.getTaskTypeId(), ""));
             // 姓名
-            wmTaskVO.setTaskUsername(userMap.getOrDefault(Integer.parseInt(wmTaskVO.getTaskUserId()), ""));
+            wmTaskVO.setTaskUsername(userMap.getOrDefault(Integer.parseInt(wmTask.getTaskUserId()), ""));
             // 报告审核状态
             wmTaskVO.setApprovalOpinionName("");
             if (StrUtil.isNotBlank(wmTask.getReportDrugApprovalOpinion())) {