From b24e024f386e7f25a071b58e9267a2c19f20ba1e Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 5b1ce4b..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);
@@ -194,41 +200,56 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request) {
- // 鍒ゆ柇鏄惁瀛樺湪闄勪欢
- if(request.getSituationDescriptionFileList() != null && !request.getSituationDescriptionFileList().isEmpty()){
new LambdaUpdateChainWrapper<>(fileMapper)
- .eq(File::getBusId, request.getProjectInfoId())
+ .eq(File::getBusId, request.getProjectReportId())
.eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION.getType())
.set(File::getDeleted,1)
.update();
request.getSituationDescriptionFileList().stream()
.forEach(file -> {
- file.setBusId(request.getProjectInfoId().longValue());
+ file.setId(null);
+ file.setBusId(request.getProjectReportId().longValue());
file.setType(FileTypeEnum.PROJECT_SITUATION_DESCRIPTION);
file.setGmtCreate(new Date());
file.setGmtUpdate(new Date());
file.setDeleted(0);
fileMapper.insert(file);
});
- }
- if(request.getCompletedReportFileList() != null && !request.getCompletedReportFileList().isEmpty()){
+
new LambdaUpdateChainWrapper<>(fileMapper)
- .eq(File::getBusId, request.getProjectInfoId())
+ .eq(File::getBusId, request.getProjectReportId())
.eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT.getType())
.set(File::getDeleted,1)
.update();
request.getCompletedReportFileList().stream()
.forEach(file -> {
- file.setBusId(request.getProjectInfoId().longValue());
+ file.setId(null);
+ file.setBusId(request.getProjectReportId().longValue());
file.setType(FileTypeEnum.PROJECT_COMPLETE_REPORT);
file.setGmtCreate(new Date());
file.setGmtUpdate(new Date());
file.setDeleted(0);
fileMapper.insert(file);
});
- }
return Result.ok("淇濆瓨鎴愬姛");
}
+
+ @Override
+ public Result getProjectProgressForm(Integer id) {
+ ProjectProgressFileListsRequest result = new ProjectProgressFileListsRequest();
+ result.setProjectReportId(id);
+ result.setCompletedReportFileList(new LambdaQueryChainWrapper<>(fileMapper)
+ .eq(File::getBusId, id)
+ .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT)
+ .eq(File::getDeleted, 0)
+ .list());
+ result.setSituationDescriptionFileList(new LambdaQueryChainWrapper<>(fileMapper)
+ .eq(File::getBusId, id)
+ .eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION)
+ .eq(File::getDeleted, 0)
+ .list());
+ return Result.ok().data(result);
+ }
}
--
Gitblit v1.8.0