From c77cab7ca85f219df136ec2aac24a22efa7837f8 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 02:38:46 +0800
Subject: [PATCH] 项目计划审批
---
business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 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..ab00a4e 100644
--- a/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
@@ -194,41 +194,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