bug修改

xuhy

2025-06-18 41e0caedb42b1220f7c89cea43c127985c0c2fb3

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

@@ -249,23 +249,6 @@
        TExperimentSchemeVO experimentSchemeVO = new TExperimentSchemeVO();
        BeanUtils.copyProperties(experimentScheme, experimentSchemeVO);

        // 查询实验调度信息
        TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentSchemeVO.getDispatchId());
        if(Objects.nonNull(experimentDispatch)){
            // 查询课题方案名称
            TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
            if(Objects.nonNull(projectProposal)){
                experimentDispatch.setProjectName(projectProposal.getProjectName());
                experimentDispatch.setProjectCode(projectProposal.getProjectCode());
            }
        }
        experimentSchemeVO.setExperimentDispatch(experimentDispatch);

        // 查询组别
        List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                .eq(TExperimentDispatchParticipants::getDispatchId, experimentSchemeVO.getDispatchId()));
        experimentSchemeVO.setExperimentDispatchParticipants(list);

        // 获取实验人员
        List<TExperimentSchemePerson> experimentSchemePersons = experimentSchemePersonService.list(Wrappers.lambdaQuery(TExperimentSchemePerson.class)
                .eq(TExperimentSchemePerson::getSchemeId, id));
@@ -278,6 +261,29 @@
            });
        });
        experimentSchemeVO.setExperimentSchemePersons(experimentSchemePersons);
        // 查询实验调度信息
        TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentSchemeVO.getDispatchId());
        if(Objects.nonNull(experimentDispatch)){
            // 查询课题方案名称
            TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
            if(Objects.nonNull(projectProposal)){
                experimentDispatch.setProjectName(projectProposal.getProjectName());
                experimentDispatch.setProjectCode(projectProposal.getProjectCode());
            }
            // 查询参与人员
            List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                    .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId()));
            List<Long> userIds1 = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
            List<SysUser> sysUsers1 = sysUserMapper.selectUserByIds(userIds1);
            String participantsName = sysUsers1.stream().map(SysUser::getNickName).collect(Collectors.joining(";"));
            experimentDispatch.setParticipantsName(participantsName);
        }
        experimentSchemeVO.setExperimentDispatch(experimentDispatch);

        // 查询组别
        List<TExperimentDispatchParticipants> list = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                .eq(TExperimentDispatchParticipants::getDispatchId, experimentSchemeVO.getDispatchId()));
        experimentSchemeVO.setExperimentDispatchParticipants(list);

        // 查询审核人姓名
        SysUser sysUser = sysUserService.selectUserById(experimentScheme.getAuditPersonId());