From 99a3c99d3e3bc046b3fcb0f23051d91a0c2edba0 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 09 十二月 2024 12:12:32 +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