提交最新代码

puzhibing

6 天以前 2fa7f761cf80802f54f727381b282d3b264501a7

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java

@@ -168,12 +168,6 @@
    @PostMapping(value = "/api/t-experiment-result-report/add")
    public R<Boolean> add(@RequestBody String param) {
        TExperimentResultReportDTO dto = JSON.parseObject(param,TExperimentResultReportDTO.class);
        // 判断是否已存在实验结果
        Long count = experimentResultReportService.count(Wrappers.lambdaQuery(TExperimentResultReport.class)
                .eq(TExperimentResultReport::getDispatchId, dto.getDispatchId()));
        if(count > 0){
            return R.fail("已存在实验结果汇报");
        }
        experimentResultReportService.save(dto);
        // 获取当前用户的项目组id
        Long userId = tokenService.getLoginUser().getUserId();
@@ -268,29 +262,48 @@
    public R<Boolean> evaluateProcess(@RequestBody String param) {
        TResultWorkEvaluate resultWorkEvaluate = JSON.parseObject(param,TResultWorkEvaluate.class);
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        if (roleType != 1 && roleType != 2) {
            return R.fail("仅管理员或审批人可以评定工艺工程师");
        }
        TExperimentResultReport experimentResultReport = experimentResultReportService.getById(resultWorkEvaluate.getResultReportId());
        if (Objects.isNull(experimentResultReport)) {
            return R.fail("实验结果汇报不存在");
        }
        if (!Objects.equals(experimentResultReport.getStatus(), 2)) {
            return R.fail("当前实验结果汇报不是待评定状态");
        }
        long evaluatedCount = resultWorkEvaluateService.count(Wrappers.lambdaQuery(TResultWorkEvaluate.class)
                .eq(TResultWorkEvaluate::getResultReportId, resultWorkEvaluate.getResultReportId())
                .eq(TResultWorkEvaluate::getEvaluateType, 1)
                .eq(TResultWorkEvaluate::getDisabled, 0));
        if (evaluatedCount > 0) {
            return R.fail("该工艺工程师工作评定已提交");
        }
        resultWorkEvaluate.setEvaluatePersonId(userId);
        resultWorkEvaluate.setEvaluateTime(LocalDateTime.now());
        resultWorkEvaluate.setStatus(1);
        resultWorkEvaluate.setEvaluateType(1);
        // 查询当前用户组
        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getUserId, userId)
                .last("LIMIT 1"));
        if(Objects.isNull(projectTeamStaff)){
            return R.fail("当前用户未分配项目组,无法进行评定");
        TExperimentDispatch dispatch = experimentDispatchService.getById(experimentResultReport.getDispatchId());
        if (Objects.isNull(dispatch)) {
            return R.fail("实验调度不存在");
        }
        TProjectTeamStaff projectTeamStaff1 = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
                .eq(TProjectTeamStaff::getRoleType, 3)
                .last("LIMIT 1"));
        if(Objects.isNull(projectTeamStaff1)){
            return R.fail("当前项目组未分配工艺工程师,无法进行评定");
        TProjectProposal proposal = projectProposalService.getById(dispatch.getProposalId());
        if (Objects.isNull(proposal)) {
            return R.fail("项目课题方案不存在");
        }
        resultWorkEvaluate.setUserId(projectTeamStaff1.getUserId());
        resultWorkEvaluate.setTeamId(projectTeamStaff.getTeamId());
        TExperimentDispatchParticipants processEngineer = experimentDispatchParticipantsService.getOne(
                Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                .eq(TExperimentDispatchParticipants::getDispatchId, dispatch.getId())
                .eq(TExperimentDispatchParticipants::getRoleType, 3)
                .last("LIMIT 1"));
        if (Objects.isNull(processEngineer)) {
            return R.fail("当前实验调度未分配工艺工程师,无法进行评定");
        }
        resultWorkEvaluate.setDispatchId(dispatch.getId());
        resultWorkEvaluate.setUserId(processEngineer.getUserId());
        resultWorkEvaluate.setTeamId(proposal.getTeamId());
        resultWorkEvaluateService.save(resultWorkEvaluate);
        // 查询实验结果汇报
        TExperimentResultReport experimentResultReport = experimentResultReportService.getById(resultWorkEvaluate.getResultReportId());
        experimentResultReport.setStatus(3);
        experimentResultReportService.updateById(experimentResultReport);
        return R.ok();