任务统计bug

xiangpei

2025-03-26 cde5e6335dd02db4d2137ba6d5f330544e764b3d

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

@@ -5,8 +5,7 @@
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectPlanExamineRecord;
import com.ycl.domain.entity.ProjectPlanInfo;
import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.vo.DepartmentApprovalResponseVO;
import com.ycl.domain.form.ProgressReportResponseForm;
import com.ycl.domain.vo.ProjectProcessToDoVo;
import com.ycl.mapper.ProjectPlanExamineRecordMapper;
import com.ycl.mapper.ProjectPlanInfoMapper;
@@ -21,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;

@@ -115,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);
@@ -136,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));
    }

    /**
@@ -156,22 +153,22 @@
    @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 item = ProjectPlanExamineRecordForm.getEntityByForm(form, null);
        item.setId(form.getId().longValue());
        item.setDepartmentUserId(SecurityUtils.getUserId());
        item.setManagerUserId(SecurityUtils.getUserId());
        baseMapper.updateById(item);
        Long projectPlanRecordId = baseMapper.selectById(item.getId()).getProjectPlanRecordId();
        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) {
            new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
@@ -181,9 +178,8 @@
            // 新增项目进度审核记录
            ProjectPlanExamineRecord newItem = new ProjectPlanExamineRecord();
            newItem.setProjectPlanRecordId(projectPlanRecordId); // 项目计划记录ID
            newItem.setProjectPlanInfoId(item.getProjectPlanInfoId()); // 项目计划项ID
            newItem.setProjectPlanInfoId(entity.getProjectPlanInfoId()); // 项目计划项ID
            newItem.setEventType(2); // 进度上报
            newItem.setDeleted(0); // 未删除
            baseMapper.insert(newItem);
        }else{
            new LambdaUpdateChainWrapper<>(projectPlanInfoMapper)
@@ -202,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("回复成功");
    }
}