From 07c4ad96c75dc93b39e002feb19845219fede415 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:09 +0800
Subject: [PATCH] 全部事项和待办事项查询功能完善
---
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
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 65e7358..ae2e7e6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -1,13 +1,17 @@
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;
+import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.entity.ProjectPlanProgressReport;
import com.ycl.domain.vo.ProgressReportResponseVO;
import com.ycl.framework.utils.PageUtil;
+import com.ycl.mapper.FileMapper;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.mapper.ProjectPlanInfoMapper;
import com.ycl.mapper.ProjectPlanProgressReportMapper;
@@ -24,6 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -42,6 +47,8 @@
private final ProjectPlanExamineRecordMapper projectPlanExamineRecordMapper;
@Autowired
private ProjectPlanInfoMapper projectPlanInfoMapper;
+ @Autowired
+ private FileMapper fileMapper;
/**
* 娣诲姞
@@ -51,7 +58,6 @@
@Transactional(rollbackFor = Exception.class)
@Override
public Result add(ProgressReportResponseVO form) {
-
ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport();
projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue());
projectPlanProgressReport.setStartTime(form.getActualStartTime());
@@ -66,6 +72,25 @@
baseMapper.updateById(projectPlanProgressReport);
}
+ // 鏂囦欢涓婁紶
+ new LambdaUpdateChainWrapper<>(fileMapper)
+ .eq(File::getBusId, form.getId())
+ .eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT.getType())
+ .set(File::getDeleted,1)
+ .update();
+ if (form.getFileList() != null && form.getFileList().size() > 0) {
+ form.getFileList().stream()
+ .forEach(file -> {
+ file.setId(null);
+ file.setBusId(form.getId().longValue());
+ file.setType(FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT);
+ file.setGmtCreate(new Date());
+ file.setGmtUpdate(new Date());
+ file.setDeleted(0);
+ fileMapper.insert(file);
+ });
+ }
+
// 鏇存柊涓婄骇鎵瑰
new LambdaUpdateChainWrapper<>(projectPlanExamineRecordMapper)
.eq(ProjectPlanExamineRecord::getId, form.getExamineRecordId())
@@ -76,7 +101,7 @@
// 鏇存柊涓婃姤鐘舵��
new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
.eq(ProjectPlanInfo::getId, form.getId())
- .set(ProjectPlanInfo::getProgressStatus, 2)
+ .set(ProjectPlanInfo::getProgressStatus, 1)
.update();
return Result.ok("娣诲姞鎴愬姛");
}
@@ -139,6 +164,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