From 12f73bafbe361f78d68a35de83ca3b3b4d4e0224 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 16:27:43 +0800
Subject: [PATCH] 查询待办任务时，判断是否挂起状态
---
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 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 58300ba..36e6537 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -10,7 +10,7 @@
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.domain.form.ProgressReportResponseForm;
import com.ycl.framework.utils.PageUtil;
import com.ycl.mapper.FileMapper;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
@@ -28,8 +28,8 @@
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -58,19 +58,24 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public Result add(ProgressReportResponseVO form) {
- ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport();
- projectPlanProgressReport.setProjectPlanInfoId(form.getId().longValue());
- projectPlanProgressReport.setStartTime(form.getActualStartTime());
- projectPlanProgressReport.setEndTime(form.getActualEndTime());
- projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr());
- projectPlanProgressReport.setActualInvest(form.getActualInvest());
-
+ public Result add(ProgressReportResponseForm form) {
// 鍒ゆ柇涓婃姤鐘舵��
if (form.getProgressStatusInt() == 0) { // 鏈紑濮� 涓婃姤杩涘害
+ ProjectPlanProgressReport projectPlanProgressReport = new ProjectPlanProgressReport();
+ projectPlanProgressReport.setProjectPlanInfoId(form.getId());
+ projectPlanProgressReport.setStartTime(form.getActualStartTime());
+ projectPlanProgressReport.setEndTime(form.getActualEndTime());
+ projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr());
+ projectPlanProgressReport.setActualInvest(form.getActualInvest());
// 鏂板杩涘害涓婃姤鍐呭
baseMapper.insert(projectPlanProgressReport);
}else if (form.getProgressStatusInt() == 2) { // 宸查┏鍥� 閲嶆柊涓婃姤
+ ProjectPlanProgressReport projectPlanProgressReport = baseMapper.selectById(form.getProgressReportId());
+ projectPlanProgressReport.setProjectPlanInfoId(form.getId());
+ projectPlanProgressReport.setStartTime(form.getActualStartTime());
+ projectPlanProgressReport.setEndTime(form.getActualEndTime());
+ projectPlanProgressReport.setProgressStatus(form.getProgressStatusStr());
+ projectPlanProgressReport.setActualInvest(form.getActualInvest());
// 鏇存柊杩涘害涓婃姤鍐呭
baseMapper.updateById(projectPlanProgressReport);
}
@@ -81,15 +86,12 @@
.eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT.getType())
.set(File::getDeleted,1)
.update();
- if (form.getFileList() != null && form.getFileList().size() > 0) {
+ if (!CollectionUtils.isEmpty(form.getFileList()) && form.getFileList().size() > 0) {
form.getFileList().stream()
.forEach(file -> {
file.setId(null);
- file.setBusId(form.getId().longValue());
+ file.setBusId(form.getId());
file.setType(FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT);
- file.setGmtCreate(new Date());
- file.setGmtUpdate(new Date());
- file.setDeleted(0);
fileMapper.insert(file);
});
}
@@ -157,10 +159,13 @@
* @return
*/
@Override
- public Result detail(Integer id) {
- ProgressReportResponseVO vo = baseMapper.getDetail(id);
+ public Result detail(Long id) {
+ ProgressReportResponseForm 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());
+ vo.setFileList(new LambdaQueryChainWrapper<>(fileMapper)
+ .eq(File::getBusId, id)
+ .eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT)
+ .list());
}
return Result.ok().data(vo);
}
@@ -179,7 +184,7 @@
}
@Override
- public Result examine(ProgressReportResponseVO form) {
+ public Result examine(ProgressReportResponseForm form) {
// 鑾峰緱瀹℃壒璁板綍鍓湰
ProjectPlanExamineRecord record = projectPlanExamineRecordMapper.selectById(form.getExamineRecordId());
@@ -194,7 +199,6 @@
newRecord.setManageExamine(form.getManageExamine());
newRecord.setManageApproval(form.getManageApproval());
newRecord.setEventType(2);
- newRecord.setDeleted(0);
projectPlanExamineRecordMapper.insert(newRecord);
// 鍒ゆ柇瀹℃壒缁撴灉
--
Gitblit v1.8.0