Merge remote-tracking branch 'origin/master'

xiangpei

2024-11-29 ec9a95eb994018cc1ba28a80946165f795001dea

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

@@ -68,7 +68,6 @@
            baseMapper.insertOne(projectPlanProgressReport);
        }else {
            projectPlanProgressReport.setId(form.getProgressReportId());
//            baseMapper.updateOne(projectPlanProgressReport);
            baseMapper.updateById(projectPlanProgressReport);
        }

@@ -81,6 +80,7 @@
        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());
@@ -181,4 +181,32 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result examine(ProgressReportResponseVO form) {
        // 更新审批记录
        ProjectPlanExamineRecord record = new ProjectPlanExamineRecord();
        record.setId(form.getExamineRecordId().longValue());
        record.setDepartmentExamine(form.getDepartmentExamine());
        record.setDepartmentApproval(form.getDepartmentApproval());
        record.setManageExamine(form.getManageExamine());
        record.setManageApproval(form.getManageApproval());
        projectPlanExamineRecordMapper.updateById(record);

        // 更新计划项状态
        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("审批成功");
    }
}