From dd90acde51538bf92eadbeb3a516c089fe137b32 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 28 十一月 2024 21:02:49 +0800
Subject: [PATCH] 文件上传
---
business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java | 31 ++++++++++++++++++++++---------
business/src/main/java/com/ycl/domain/vo/ProjectProgressFileListsRequest.java | 2 +-
business/src/main/java/com/ycl/service/ProgressPlanService.java | 2 ++
business/src/main/java/com/ycl/controller/ProgressPlanController.java | 5 +++++
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 4 ++++
5 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProgressPlanController.java b/business/src/main/java/com/ycl/controller/ProgressPlanController.java
index 96a0043..6c2e2c0 100644
--- a/business/src/main/java/com/ycl/controller/ProgressPlanController.java
+++ b/business/src/main/java/com/ycl/controller/ProgressPlanController.java
@@ -89,4 +89,9 @@
return progressPlanService.saveProjectProgressFileLists(request);
}
+ @GetMapping("/getProjectProgressForm/{id}")
+ public Result getProjectProgressForm(@PathVariable("id") Integer id) {
+ return progressPlanService.getProjectProgressForm(id);
+ }
+
}
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectProgressFileListsRequest.java b/business/src/main/java/com/ycl/domain/vo/ProjectProgressFileListsRequest.java
index 5681e83..02bdab1 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectProgressFileListsRequest.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectProgressFileListsRequest.java
@@ -11,7 +11,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class ProjectProgressFileListsRequest {
- private Integer projectInfoId;
+ private Integer projectReportId;
private List<File> completedReportFileList;
private List<File> situationDescriptionFileList;
}
diff --git a/business/src/main/java/com/ycl/service/ProgressPlanService.java b/business/src/main/java/com/ycl/service/ProgressPlanService.java
index 0fcdb6c..aee7fc4 100644
--- a/business/src/main/java/com/ycl/service/ProgressPlanService.java
+++ b/business/src/main/java/com/ycl/service/ProgressPlanService.java
@@ -71,4 +71,6 @@
* @return
*/
Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request);
+
+ Result getProjectProgressForm(Integer id);
}
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..a591d53 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,54 @@
@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.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.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);
+ }
}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
index 7f84aab..408768c 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.base.Result;
import com.ycl.common.enums.business.FileTypeEnum;
@@ -162,6 +163,9 @@
@Override
public Result detail(Integer id) {
ProgressReportResponseVO vo = baseMapper.getDetail(id);
+ if (vo != null) {
+ vo.setFileList(new LambdaQueryChainWrapper<>(fileMapper).eq(File::getBusId, id).eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT).list());
+ }
return Result.ok().data(vo);
}
--
Gitblit v1.8.0