Merge remote-tracking branch 'origin/master'

fuliqi

2024-11-29 74ac7e48013eeb73fe76ad5c31c4b7afad967d0d

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

 business/src/main/java/com/ycl/controller/ProjectPlanProgressReportController.java

@@ -40,6 +40,11 @@
        return projectPlanProgressReportService.add(form);
    }

    @PostMapping("/examine")
    public Result examine(@RequestBody @Validated(Add.class) ProgressReportResponseVO form) {
        return projectPlanProgressReportService.examine(form);
    }

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    @PreAuthorize("hasAuthority('projectPlanProgressReport:edit')")

 business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java

@@ -36,10 +36,12 @@
    private Integer progressStatus;

    @TableField("start_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    /** 计划开始时间 */
    private Date startTime;

    @TableField("end_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    /** 计划完成时间 */
    private Date endTime;


 business/src/main/java/com/ycl/service/ProjectPlanProgressReportService.java

@@ -64,4 +64,6 @@
     * @return
     */
    Result all();

    Result examine(ProgressReportResponseVO form);
}

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

@@ -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("审批成功");
    }
}