乐山实验室
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2 天以前 0c989fbcca1cd4b53d59e8ba288227a5a68d92a4 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java


@@ -52,8 +52,10 @@


    private final TProjectProposalService projectProposalService;


    private final TExperimentDispatchGroupService experimentDispatchGroupService;


    private final TProjectTeamStaffService projectTeamStaffService;


    private final TProjectTeamService projectTeamService;


    private final TNoticeService noticeService;


    @Autowired


    public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService, TProjectTeamStaffService projectTeamStaffService) {


    public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TNoticeService noticeService) {


        this.experimentSchemeService = experimentSchemeService;


        this.tokenService = tokenService;


        this.sysUserService = sysUserService;


@@ -64,6 +66,8 @@


        this.projectProposalService = projectProposalService;


        this.experimentDispatchGroupService = experimentDispatchGroupService;


        this.projectTeamStaffService = projectTeamStaffService;


        this.projectTeamService = projectTeamService;


        this.noticeService = noticeService;


    }




    /**


@@ -77,6 +81,7 @@


        // 获取当前用户


        Long userId = tokenService.getLoginUser().getUserId();


        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();


        query.setRoleType(roleType);


        if (roleType != 1){


            query.setUserId(userId);


            if(roleType ==2){


@@ -118,6 +123,7 @@


        // 获取当前用户


        Long userId = tokenService.getLoginUser().getUserId();


        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();


        query.setRoleType(roleType);


        if (roleType != 1){


            query.setUserId(userId);


            // 查询实验参与人员


@@ -148,6 +154,7 @@


                if(sysUser != null){


                    tExperimentDispatchParticipant.setNickName(sysUser.getNickName());


                    tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());


                    tExperimentDispatchParticipant.setCreateTime(sysUser.getCreateTime());


                }


            });


        }


@@ -214,6 +221,23 @@


        TExperimentSchemeDTO dto = JSON.parseObject(param,TExperimentSchemeDTO.class);


        dto.setStatus(6);


        experimentSchemeService.updateById(dto);




        // 通过当前用户查询项目组


        Long userId = tokenService.getLoginUser().getUserId();


        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                .eq(TProjectTeamStaff::getUserId, userId)


                .last("LIMIT 1"));


        // 查询项目组


        TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());


        // MESSAGE 添加消息


        TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())


                .eq(TProjectTeamStaff::getRoleType, 3)


                .last("LIMIT 1"));


        if(Objects.nonNull(teamStaff)){


            noticeService.saveNotice(teamStaff.getUserId(), "实验员已提交实验方案，请查收！", tokenService.getLoginUser().getUser().getNickName(),8);


        }




        return R.ok();


    }




@@ -228,23 +252,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));


@@ -257,6 +264,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());


@@ -309,6 +339,22 @@


                .set(TExperimentScheme::getStopFile, applicationTerminationDTO.getStopFile())


                .set(TExperimentScheme::getStopFileName, applicationTerminationDTO.getStopFileName())


                .set(TExperimentScheme::getCommitSign, applicationTerminationDTO.getCommitSign()));


        // 通过当前用户查询项目组


        Long userId = tokenService.getLoginUser().getUserId();


        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                .eq(TProjectTeamStaff::getUserId, userId)


                .last("LIMIT 1"));


        // 查询项目组


        TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());


        // MESSAGE 添加消息


        TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)


                .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())


                .eq(TProjectTeamStaff::getRoleType, 2)


                .last("LIMIT 1"));


        if(Objects.nonNull(teamStaff)){


            noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【实验方案中止申请】等待审批", tokenService.getLoginUser().getUser().getNickName(),2);


        }




        return R.ok();


    }