Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 7289189c907038db99d41aefcd9e12dce5077d3e

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

@@ -74,6 +74,16 @@
        TExperimentSchemeQuery query = JSON.parseObject(param, TExperimentSchemeQuery.class);
        return R.ok(experimentSchemeService.pageList(query));
    }
    /**
     * 获取实验方案管理列表-中止审批列表
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:list')")
    @ApiOperation(value = "获取实验方案分页列表-中止审批列表",response = TExperimentSchemeQuery.class)
    @PostMapping(value = "/api/t-experiment-scheme/auditPageList")
    public R<PageInfo<TExperimentSchemeVO>> auditPageList(@RequestBody String param) {
        TExperimentSchemeQuery query = JSON.parseObject(param, TExperimentSchemeQuery.class);
        return R.ok(experimentSchemeService.auditPageList(query));
    }

    /**
     * 通过实验调度查询查询组别列表
@@ -148,6 +158,20 @@
    }

    /**
     * 修改实验方案
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:edit')")
    @Log(title = "实验方案信息-修改实验方案-实验员提交", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改实验方案-实验员提交")
    @PostMapping(value = "/api/t-experiment-scheme/updateTester")
    public R<Boolean> updateTester(@RequestBody String param) {
        TExperimentSchemeDTO dto = JSON.parseObject(param,TExperimentSchemeDTO.class);
        dto.setStatus(6);
        experimentSchemeService.updateById(dto);
        return R.ok();
    }

    /**
     * 查看实验方案详情
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:detail')")
@@ -165,6 +189,7 @@
            TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
            if(Objects.nonNull(projectProposal)){
                experimentDispatch.setProjectName(projectProposal.getProjectName());
                experimentDispatch.setProjectCode(projectProposal.getProjectCode());
            }
        }
        experimentSchemeVO.setExperimentDispatch(experimentDispatch);
@@ -177,7 +202,21 @@
        // 获取实验人员
        List<TExperimentSchemePerson> experimentSchemePersons = experimentSchemePersonService.list(Wrappers.lambdaQuery(TExperimentSchemePerson.class)
                .eq(TExperimentSchemePerson::getSchemeId, id));
        List<Long> userIds = experimentSchemePersons.stream().map(TExperimentSchemePerson::getUserId).collect(Collectors.toList());
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
        sysUsers.forEach(sysUser -> {
            experimentSchemePersons.stream().filter(experimentSchemePerson -> experimentSchemePerson.getUserId().equals(sysUser.getUserId())).forEach(experimentSchemePerson -> {
                experimentSchemePerson.setNickName(sysUser.getNickName());
                experimentSchemePerson.setAvatar(sysUser.getAvatar());
            });
        });
        experimentSchemeVO.setExperimentSchemePersons(experimentSchemePersons);

        // 查询审核人姓名
        SysUser sysUser = sysUserService.selectUserById(experimentScheme.getAuditPersonId());
        if(Objects.nonNull(sysUser)){
            experimentSchemeVO.setAuditPersonName(sysUser.getNickName());
        }

        return R.ok(experimentSchemeVO);
    }
@@ -213,7 +252,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:sign')")
    @Log(title = "实验方案信息-申请中止实验", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "申请中止实验")
    @ApiOperation(value = "申请中止实验",response = ApplicationTerminationDTO.class)
    @PostMapping(value = "/api/t-experiment-scheme/applicationTermination")
    public R<Boolean> applicationTermination(@RequestBody String param) {
        ApplicationTerminationDTO applicationTerminationDTO = JSON.parseObject(param, ApplicationTerminationDTO.class);