From 13b61a3d8909a579e88c346756d621728b59855c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 十二月 2024 16:11:43 +0800
Subject: [PATCH] 任务发起人信息设置

---
 business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
index a591d53..ef903c0 100644
--- a/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
@@ -129,6 +129,8 @@
                     progressPlanInfoFlag.setPlanInfoList(
                             new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
                                     .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
+                                    .eq(ProjectPlanInfo::getDeleted, 0) // 鏈垹闄�
+                                    .eq(ProjectPlanInfo::getPlanStatus, 2) // 璁″垝椤瑰鎵归�氳繃
                                     .list()
                     );
                     monthProgress.add(progressPlanInfoFlag);
@@ -146,6 +148,8 @@
                     progressPlanInfoFlag.setPlanInfoList(
                             new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
                                     .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
+                                    .eq(ProjectPlanInfo::getDeleted, 0) // 鏈垹闄�
+                                    .eq(ProjectPlanInfo::getPlanStatus, 2) // 璁″垝椤瑰鎵归�氳繃
                                     .list()
                     );
                     seasonProgress.add(progressPlanInfoFlag);
@@ -163,6 +167,8 @@
                     progressPlanInfoFlag.setPlanInfoList(
                             new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
                                     .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
+                                    .eq(ProjectPlanInfo::getDeleted, 0) // 鏈垹闄�
+                                    .eq(ProjectPlanInfo::getPlanStatus, 2) // 璁″垝椤瑰鎵归�氳繃
                                     .list()
                     );
                     yearProgress.add(progressPlanInfoFlag);
@@ -202,6 +208,7 @@
 
             request.getSituationDescriptionFileList().stream()
                     .forEach(file -> {
+                        file.setId(null);
                         file.setBusId(request.getProjectReportId().longValue());
                         file.setType(FileTypeEnum.PROJECT_SITUATION_DESCRIPTION);
                         file.setGmtCreate(new Date());
@@ -218,6 +225,7 @@
 
             request.getCompletedReportFileList().stream()
                     .forEach(file -> {
+                        file.setId(null);
                         file.setBusId(request.getProjectReportId().longValue());
                         file.setType(FileTypeEnum.PROJECT_COMPLETE_REPORT);
                         file.setGmtCreate(new Date());

--
Gitblit v1.8.0