修改任务接口

xiangpei

2025-04-07 80662b34fe93b4ede00c7fc03fbd9f01355c94e2

 business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java

@@ -4,10 +4,11 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.vo.DepartmentApprovalResponseVO;
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.form.ProgressReportResponseForm;
import com.ycl.domain.vo.ProjectProcessToDoVo;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.mapper.ProjectPlanInfoMapper;
import com.ycl.mapper.ProjectPlanRecordMapper;
import com.ycl.service.ProjectPlanExamineRecordService;
import com.ycl.common.base.Result;
@@ -19,9 +20,9 @@
import lombok.RequiredArgsConstructor;
import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;

import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@@ -37,6 +38,7 @@

    private final ProjectPlanExamineRecordMapper projectPlanExamineRecordMapper;
    private final ProjectPlanRecordMapper projectPlanRecordMapper;
    private final ProjectPlanInfoMapper projectPlanInfoMapper;

    /**
     * 添加
@@ -112,7 +114,7 @@
     * @return
     */
    @Override
    public Result detail(Integer id) {
    public Result detail(Long id) {
        ProjectPlanExamineRecordVO vo = baseMapper.getById(id);
        Assert.notNull(vo, "记录不存在");
        return Result.ok().data(vo);
@@ -133,15 +135,13 @@
    }

    @Override
    public Result departmentApproval(Integer projectPlanRecordId) {
        List<DepartmentApprovalResponseVO> vo = baseMapper.selectInfo(projectPlanRecordId);
        return Result.ok().data(vo);
    public Result departmentApproval(Long projectPlanRecordId) {
        return Result.ok().data(baseMapper.selectInfo(projectPlanRecordId));
    }

    @Override
    public Result planLog(Integer projectPlanRecordId) {
        List<DepartmentApprovalResponseVO> vo = baseMapper.getPlanLog(projectPlanRecordId);
        return Result.ok().data(vo);
    public Result planLog(Long projectPlanRecordId) {
        return Result.ok().data(baseMapper.getPlanLog(projectPlanRecordId));
    }

    /**
@@ -153,31 +153,41 @@
    @Override
    public Result replyExamine(ProjectPlanExamineRecordForm form) {
        ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
        projectPlanExamineRecord.setId(form.getId().longValue());
        projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId());
        projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId());
        projectPlanExamineRecord.setId(form.getId());
        baseMapper.updateById(projectPlanExamineRecord);
        return Result.ok("回复成功");
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result saveExamine(ProjectPlanExamineRecordForm form) {
        // 判断，如果都同意，则直接更新审批记录
        // 更新审批记录
        ProjectPlanExamineRecord entity = new ProjectPlanExamineRecord();
        BeanUtils.copyProperties(form, entity);
        entity.setId(form.getId());
        entity.setDepartmentUserId(SecurityUtils.getUserId());
        entity.setManagerUserId(SecurityUtils.getUserId());
        baseMapper.updateById(entity);
        Long projectPlanRecordId = baseMapper.selectById(entity.getId()).getProjectPlanRecordId();
        // 如果同意，计划项状态为已通过，并且新增一条项目进度审核记录，否则为已驳回
        if (null != form.getDepartmentExamine() && null != form.getManageExamine() && form.getDepartmentExamine() == 0 && form.getManageExamine() == 0) {
            ProjectPlanExamineRecord projectPlanExamineRecord = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
            projectPlanExamineRecord.setId(form.getId().longValue());
            projectPlanExamineRecord.setDepartmentUserId(SecurityUtils.getUserId());
            projectPlanExamineRecord.setManagerUserId(SecurityUtils.getUserId());
            baseMapper.updateById(projectPlanExamineRecord);
            new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
                    .eq(ProjectPlanInfo::getId, form.getProjectPlanInfoId())
                    .set(ProjectPlanInfo::getPlanStatus, 2)
                    .update();
            // 新增项目进度审核记录
            ProjectPlanExamineRecord newItem = new ProjectPlanExamineRecord();
            newItem.setProjectPlanRecordId(projectPlanRecordId); // 项目计划记录ID
            newItem.setProjectPlanInfoId(entity.getProjectPlanInfoId()); // 项目计划项ID
            newItem.setEventType(2); // 进度上报
            baseMapper.insert(newItem);
        }else{
            new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
                    .eq(ProjectPlanInfo::getId, form.getProjectPlanInfoId())
                    .set(ProjectPlanInfo::getPlanStatus, 1)
                    .update();
        }
        // 否则，将项目记录设置为未上报，并将记录逻辑删除
        new LambdaUpdateChainWrapper<>(projectPlanRecordMapper)
                .eq(ProjectPlanRecord::getId, form.getProjectPlanRecordId())
                .set(ProjectPlanRecord::getReportStatus, 1);
        new LambdaUpdateChainWrapper<>(baseMapper)
                .eq(ProjectPlanExamineRecord::getProjectPlanRecordId, form.getProjectPlanRecordId())
                .remove();
        return Result.ok("回复成功");
        return Result.ok("审批成功");
    }

    @Override
@@ -188,4 +198,14 @@
        baseMapper.todoList(page, query, userId);
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }

    @Override
    public Result reply(ProgressReportResponseForm form) {
        new LambdaUpdateChainWrapper<>(baseMapper)
                .eq(ProjectPlanExamineRecord::getId, form.getExamineRecordId())
                .set(ProjectPlanExamineRecord::getDepartmentApprovalReply, form.getDepartmentApprovalReply())
                .set(ProjectPlanExamineRecord::getManageApprovalReply, form.getManageApprovalReply())
                .update();
        return Result.ok("回复成功");
    }
}