From bc39ec8b39c01c432bfd672c7231bf4d715cd409 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 26 Sep 2024 10:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B0=E5=BD=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/PersonnelPlanLogController.java | 7 ++++++-
 .../gunshi/project/xyt/controller/SzCaseController.java    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
index 1b33507..95e3429 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/PersonnelPlanLogController.java
@@ -280,7 +280,12 @@ public class PersonnelPlanLogController extends AbstractCommonFileController{
             query.like(PersonnelPlanLog::getApplicant, unit);
         }
 
-        return R.ok(service.page(page.getPageSo().toPage(), query));
+        Page<PersonnelPlanLog> data = service.page(page.getPageSo().toPage(), query);
+        data.getRecords().forEach(o -> {
+            o.setFiles1(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"1"));
+            o.setFiles2(fileService.getFiles(getGroupId(),String.valueOf(o.getId()),"2"));
+        });
+        return R.ok(data);
     }
 
     @Override
diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
index 207cab7..4233846 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SzCaseController.java
@@ -182,6 +182,7 @@ public class SzCaseController extends AbstractCommonFileController{
         List<SzCaseStatisticsVo> vos = Lists.newArrayList();
 
         List<SzCase> list = query.list();
+
         if (CollectionUtils.isNotEmpty(list)){
             Map<Integer, Long> sourceCount = Maps.newHashMap();
                     switch (num){