From 539dc10dfda8fa0bf01a4f8c85110e9cc31136db Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 27 May 2025 10:35:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=88=A4=E7=A9=BA=202.?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E9=A1=B9=E7=9B=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90(=E5=AF=BC=E5=87=BA)=203.=E6=96=B0=E5=A2=9E=E7=BB=84?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=96=BD=E4=B8=93=E7=8F=AD?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouContractinfoServiceImpl.java   |  7 +++++--
 .../impl/HuzhouPlaninfofileServiceImpl.java   |  4 +++-
 .../impl/HuzhouProjectinfoServiceImpl.java    | 19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
index 9134bde..3ee9224 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouContractinfoServiceImpl.java
@@ -400,9 +400,11 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
                 // 返回合同信息(计划)
                 ContractInfoVo contractInfoVo = new ContractInfoVo();
                 List<HuzhouContractinfo> planList = this.getPlanContractinfoByprojectId(projectId);
-
+                for (HuzhouContractinfo huzhouContractinfo : planList) {
+                    log.info("计划合同信息:"+huzhouContractinfo.getTaskName());
+                }
                 planList= planList.stream()
-                        .filter(item -> item.getTaskName().equals(taskName))
+                        .filter(item -> item.getTaskName() != null && item.getTaskName().equals(taskName))
                         .collect(Collectors.toList());
                 contractInfoVo.setHasInfo(true);
                 contractInfoVo.setPlanList(planList);
@@ -514,6 +516,7 @@ public class HuzhouContractinfoServiceImpl extends ServiceImpl<HuzhouContractinf
 
                         // 假设计划合同信息列表也需要按某种顺序排序，这里假设也是按 payDate
                         List<HuzhouContractinfo> sortedPlanContracts = planContractInfoList.stream()
+                                .filter(item -> item.getTaskName() != null)
                                 .filter(contract -> contract.getTaskName().equals(taskNameFromContract))
                                 .sorted(Comparator.comparing(HuzhouContractinfo::getPayDate))
                                 .collect(Collectors.toList());
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
index becbb14..6d1270b 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfofileServiceImpl.java
@@ -211,9 +211,11 @@ public class HuzhouPlaninfofileServiceImpl extends ServiceImpl<HuzhouPlaninfofil
            hashMap.put("projectStartMeeting","项目启动会议");
            hashMap.put("projectDeploymentStage","项目部署阶段");
            hashMap.put("performanceEvaluation","绩效评估");
-           hashMap.put("betaTestingStage","试运行阶段");
            hashMap.put("niceProjectAcceptanceStage","示范项目验收阶段");
+           hashMap.put("betaTestingStage","试运行阶段");
            hashMap.put("modularAcceptanceStage","分模块验收阶段");
+           //湖州市中心医院基于人工智能的病历质量综合管理项目
+           hashMap.put("setUpProjectTeam","组建项目实施专班");
             // 假设比较的值是来自外部输入，命名为 value
            String key = null;
             // 遍历 HashMap 查找匹配的 key
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 59f87c8..9138940 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -2785,8 +2785,24 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
 
         // 1.获取所有项目信息
         List<HuzhouProjectinfo> projectInfoList = this.list();
+        // 根据用户角色权限过滤项目
+        Page page = new Page(1, projectInfoList.size());
+        HuzhouProjectinfo projectinfo = new HuzhouProjectinfo();
+        projectinfo.setStage("4");
+        ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectinfo);
+
+        Page<HuzhouProjectinfoOV> projectAndChildInfoPageList;
+        projectAndChildInfoPageList = projectinfoMapper.getProjectAndChildInfoPageList(page, projectInfoAuthSelect);
+        List<HuzhouProjectinfoOV> records = projectAndChildInfoPageList.getRecords();
+        List<String> ids = records.stream()
+                .map(HuzhouProjectinfoOV::getId)
+                .collect(Collectors.toList());
+
+
         projectInfoList= projectInfoList.stream()
                 .filter(project -> !"-1".equals(project.getStage()))
+                .filter(project -> !"湖州市长兴县浙里健康e生省级试点应用建设项目".equals(project.getProjectName()))
+                .filter(project -> ids.contains(project.getId()))
                 .collect(Collectors.toList());
 
 
@@ -2888,6 +2904,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             projectInfoList= projectInfoList.stream()
                     .filter(project -> !"-1".equals(project.getStage()))
                     .filter(project -> ids.contains(project.getId()))
+                    .filter(project -> !"湖州市长兴县浙里健康e生省级试点应用建设项目".equals(project.getProjectName()))
                     .collect(Collectors.toList());
             for (HuzhouProjectinfo projectInfo : projectInfoList) {
                 String projectId = projectInfo.getId();
@@ -3047,7 +3064,7 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
         }
     }
 
-    //TODO 设计评分
+    //设计评分
     private void fillScore(HuzhouProjectinfo projectInfo) {
         Double uploadFileRate = projectInfo.getUploadFileRate();
         // 初始化分数