From 80662b34fe93b4ede00c7fc03fbd9f01355c94e2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 07 四月 2025 13:52:17 +0800
Subject: [PATCH] 修改任务接口
---
business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 insertions(+), 6 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 79674ce..36e6537 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanProgressReportServiceImpl.java
@@ -1,10 +1,20 @@
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.common.utils.SecurityUtils;
+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.domain.form.ProgressReportResponseForm;
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;
import com.ycl.service.ProjectPlanProgressReportService;
@@ -12,10 +22,13 @@
import com.ycl.domain.form.ProjectPlanProgressReportForm;
import com.ycl.domain.vo.ProjectPlanProgressReportVO;
import com.ycl.domain.query.ProjectPlanProgressReportQuery;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.stream.Collectors;
@@ -31,16 +44,62 @@
public class ProjectPlanProgressReportServiceImpl extends ServiceImpl<ProjectPlanProgressReportMapper, ProjectPlanProgressReport> implements ProjectPlanProgressReportService {
private final ProjectPlanProgressReportMapper projectPlanProgressReportMapper;
+ @Autowired
+ private final ProjectPlanExamineRecordMapper projectPlanExamineRecordMapper;
+ @Autowired
+ private ProjectPlanInfoMapper projectPlanInfoMapper;
+ @Autowired
+ private FileMapper fileMapper;
/**
* 娣诲姞
* @param form
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@Override
- public Result add(ProjectPlanProgressReportForm form) {
- ProjectPlanProgressReport entity = ProjectPlanProgressReportForm.getEntityByForm(form, null);
- baseMapper.insert(entity);
+ 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);
+ }
+
+ // 鏂囦欢涓婁紶
+ new LambdaUpdateChainWrapper<>(fileMapper)
+ .eq(File::getBusId, form.getId())
+ .eq(File::getType, FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT.getType())
+ .set(File::getDeleted,1)
+ .update();
+ if (!CollectionUtils.isEmpty(form.getFileList()) && form.getFileList().size() > 0) {
+ form.getFileList().stream()
+ .forEach(file -> {
+ file.setId(null);
+ file.setBusId(form.getId());
+ file.setType(FileTypeEnum.PROJECT_PROGRESS_INFO_REPORT);
+ fileMapper.insert(file);
+ });
+ }
+ // 鏇存柊璁″垝椤圭殑杩涘害鐘舵�佷负鏈鏍�
+ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getId, form.getId())
+ .set(ProjectPlanInfo::getProgressStatus, 1)
+ .update();
return Result.ok("娣诲姞鎴愬姛");
}
@@ -100,8 +159,14 @@
* @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());
+ }
return Result.ok().data(vo);
}
@@ -117,4 +182,39 @@
.collect(Collectors.toList());
return Result.ok().data(vos);
}
+
+ @Override
+ public Result examine(ProgressReportResponseForm form) {
+ // 鑾峰緱瀹℃壒璁板綍鍓湰
+ ProjectPlanExamineRecord record = projectPlanExamineRecordMapper.selectById(form.getExamineRecordId());
+
+ // 鏂板涓�鏉″鎵硅褰�
+ ProjectPlanExamineRecord newRecord = new ProjectPlanExamineRecord();;
+ newRecord.setProjectPlanRecordId(record.getProjectPlanRecordId());
+ newRecord.setProjectPlanInfoId(record.getProjectPlanInfoId());
+ newRecord.setDepartmentUserId(SecurityUtils.getUserId());
+ newRecord.setDepartmentExamine(form.getDepartmentExamine());
+ newRecord.setDepartmentApproval(form.getDepartmentApproval());
+ newRecord.setManagerUserId(SecurityUtils.getUserId());
+ newRecord.setManageExamine(form.getManageExamine());
+ newRecord.setManageApproval(form.getManageApproval());
+ newRecord.setEventType(2);
+ projectPlanExamineRecordMapper.insert(newRecord);
+
+ // 鍒ゆ柇瀹℃壒缁撴灉
+ if (form.getDepartmentExamine() == 0 && form.getManageExamine() == 0) { // 瀹℃壒閫氳繃
+ // 璁″垝椤硅繘搴︾姸鎬佹洿鏂颁负宸插畬鎴�
+ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getId, form.getId())
+ .set(ProjectPlanInfo::getProgressStatus, 3)
+ .update();
+ }else { // 瀹℃壒涓嶉�氳繃
+ // 璁″垝椤硅繘搴︾姸鎬佹洿鏂颁负宸查┏鍥�
+ new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
+ .eq(ProjectPlanInfo::getId, form.getId())
+ .set(ProjectPlanInfo::getProgressStatus, 2)
+ .update();
+ }
+ return Result.ok("瀹℃壒鎴愬姛");
+ }
}
--
Gitblit v1.8.0