From 982e63b981079caaae2be3ad8bb11d29cf9cd97b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 24 十二月 2024 14:43:36 +0800
Subject: [PATCH] 驳回使用自带驳回，对已完成流程查看流程推进的处理
---
business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java | 144 +++++++++++++++++++++++-------------------------
1 files changed, 69 insertions(+), 75 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 ab00a4e..f17a350 100644
--- a/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProgressPlanServiceImpl.java
@@ -12,7 +12,7 @@
import com.ycl.domain.vo.ProgressPlanInfoFlag;
import com.ycl.domain.vo.ProgressPlanInfoResponseVO;
import com.ycl.domain.vo.ProgressPlanVO;
-import com.ycl.domain.vo.ProjectProgressFileListsRequest;
+import com.ycl.domain.form.ProjectProgressFileListsForm;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.*;
import com.ycl.service.ProgressPlanService;
@@ -111,7 +111,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
ProgressPlanInfoResponseVO vo = new ProgressPlanInfoResponseVO();
List<ProgressPlanInfoFlag> monthProgress = new ArrayList<>();
List<ProgressPlanInfoFlag> seasonProgress = new ArrayList<>();
@@ -119,64 +119,66 @@
// 鏌ヨ鏈堝害璁″垝椤�
new LambdaQueryChainWrapper<>(projectPlanRecordMapper)
- .eq(ProjectPlanRecord::getProjectInfoId, id)
- .eq(ProjectPlanRecord::getPlanTimeFlag, 0)
- .list()
- .stream().forEach(record -> {
- ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag();
- progressPlanInfoFlag.setPlanTime(record.getPlanTime());
- progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag());
- progressPlanInfoFlag.setPlanInfoList(
- new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
- .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
- .list()
- );
- monthProgress.add(progressPlanInfoFlag);
- });
+ .eq(ProjectPlanRecord::getProjectInfoId, id)
+ .eq(ProjectPlanRecord::getPlanTimeFlag, 0)
+ .list()
+ .stream().forEach(record -> {
+ ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag();
+ progressPlanInfoFlag.setPlanTime(record.getPlanTime());
+ progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag());
+ progressPlanInfoFlag.setPlanInfoList(
+ new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
+ .eq(ProjectPlanInfo::getDeleted, 0) // 鏈垹闄�
+ .eq(ProjectPlanInfo::getPlanStatus, 2) // 璁″垝椤瑰鎵归�氳繃
+ .list()
+ );
+ monthProgress.add(progressPlanInfoFlag);
+ });
// 鏌ヨ瀛ｅ害璁″垝椤�
new LambdaQueryChainWrapper<>(projectPlanRecordMapper)
- .eq(ProjectPlanRecord::getProjectInfoId, id)
- .eq(ProjectPlanRecord::getPlanTimeFlag, 1)
- .list()
- .stream().forEach(record -> {
- ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag();
- progressPlanInfoFlag.setPlanTime(record.getPlanTime());
- progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag());
- progressPlanInfoFlag.setPlanInfoList(
- new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
- .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
- .list()
- );
- seasonProgress.add(progressPlanInfoFlag);
- });
+ .eq(ProjectPlanRecord::getProjectInfoId, id)
+ .eq(ProjectPlanRecord::getPlanTimeFlag, 1)
+ .list()
+ .stream().forEach(record -> {
+ ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag();
+ progressPlanInfoFlag.setPlanTime(record.getPlanTime());
+ progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag());
+ progressPlanInfoFlag.setPlanInfoList(
+ new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
+ .eq(ProjectPlanInfo::getDeleted, 0) // 鏈垹闄�
+ .eq(ProjectPlanInfo::getPlanStatus, 2) // 璁″垝椤瑰鎵归�氳繃
+ .list()
+ );
+ seasonProgress.add(progressPlanInfoFlag);
+ });
// 鏌ヨ骞村害璁″垝椤�
new LambdaQueryChainWrapper<>(projectPlanRecordMapper)
- .eq(ProjectPlanRecord::getProjectInfoId, id)
- .eq(ProjectPlanRecord::getPlanTimeFlag, 2)
- .list()
- .stream().forEach(record -> {
- ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag();
- progressPlanInfoFlag.setPlanTime(record.getPlanTime());
- progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag());
- progressPlanInfoFlag.setPlanInfoList(
- new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
- .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
- .list()
- );
- yearProgress.add(progressPlanInfoFlag);
- });
+ .eq(ProjectPlanRecord::getProjectInfoId, id)
+ .eq(ProjectPlanRecord::getPlanTimeFlag, 2)
+ .list()
+ .stream().forEach(record -> {
+ ProgressPlanInfoFlag progressPlanInfoFlag = new ProgressPlanInfoFlag();
+ progressPlanInfoFlag.setPlanTime(record.getPlanTime());
+ progressPlanInfoFlag.setPlanTimeFlag(record.getPlanTimeFlag());
+ progressPlanInfoFlag.setPlanInfoList(
+ new LambdaQueryChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getProjectPlanRecordId, record.getId())
+ .eq(ProjectPlanInfo::getDeleted, 0) // 鏈垹闄�
+ .eq(ProjectPlanInfo::getPlanStatus, 2) // 璁″垝椤瑰鎵归�氳繃
+ .list()
+ );
+ yearProgress.add(progressPlanInfoFlag);
+ });
vo.setMonthProgress(monthProgress);
vo.setSeasonProgress(seasonProgress);
vo.setYearProgress(yearProgress);
return Result.ok().data(vo);
}
-
- /**
- *
- */
/**
* 鍒楄〃
@@ -193,57 +195,49 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Result saveProjectProgressFileLists(ProjectProgressFileListsRequest request) {
+ public Result saveProjectProgressFileLists(ProjectProgressFileListsForm form) {
new LambdaUpdateChainWrapper<>(fileMapper)
- .eq(File::getBusId, request.getProjectReportId())
+ .eq(File::getBusId, form.getProjectReportId())
.eq(File::getType, FileTypeEnum.PROJECT_SITUATION_DESCRIPTION.getType())
- .set(File::getDeleted,1)
- .update();
+ .remove();
- request.getSituationDescriptionFileList().stream()
+ form.getSituationDescriptionFileList().stream()
.forEach(file -> {
file.setId(null);
- file.setBusId(request.getProjectReportId().longValue());
+ file.setBusId(form.getProjectReportId());
file.setType(FileTypeEnum.PROJECT_SITUATION_DESCRIPTION);
- file.setGmtCreate(new Date());
- file.setGmtUpdate(new Date());
- file.setDeleted(0);
fileMapper.insert(file);
});
new LambdaUpdateChainWrapper<>(fileMapper)
- .eq(File::getBusId, request.getProjectReportId())
+ .eq(File::getBusId, form.getProjectReportId())
.eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT.getType())
- .set(File::getDeleted,1)
- .update();
+ .remove();
- request.getCompletedReportFileList().stream()
+ form.getCompletedReportFileList().stream()
.forEach(file -> {
file.setId(null);
- file.setBusId(request.getProjectReportId().longValue());
+ file.setBusId(form.getProjectReportId());
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();
+ public Result getProjectProgressForm(Long id) {
+ ProjectProgressFileListsForm result = new ProjectProgressFileListsForm();
result.setProjectReportId(id);
result.setCompletedReportFileList(new LambdaQueryChainWrapper<>(fileMapper)
- .eq(File::getBusId, id)
- .eq(File::getType, FileTypeEnum.PROJECT_COMPLETE_REPORT)
- .eq(File::getDeleted, 0)
- .list());
+ .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());
+ .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