提交最新代码

puzhibing

6 天以前 2fa7f761cf80802f54f727381b282d3b264501a7

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

@@ -25,6 +25,7 @@
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -81,12 +82,16 @@
        // 获取当前用户
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if (roleType != 1){
            query.setUserId(userId);
            if(roleType ==2){
                // 查询项目组
                TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                        .eq(TProjectTeamStaff::getUserId, userId));
                if(Objects.isNull(projectTeamStaff)){
                    return R.fail("当前用户未加入项目组,无法进行操作");
                }
                // 查询项目的工艺工程师id
                TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                        .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
@@ -122,14 +127,36 @@
        // 获取当前用户
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if (roleType != 1){
            query.setUserId(userId);
            // 查询实验参与人员
            List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                    .eq(TExperimentDispatchParticipants::getUserId, userId));
            if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
                List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
                query.setDispatchIds(dispatchIds);
            if(roleType ==2){
                // 查询项目组
                TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                        .eq(TProjectTeamStaff::getUserId, userId));
                if(Objects.isNull(projectTeamStaff)){
                    return R.fail("当前用户未加入项目组,无法进行操作");
                }
                // 查询项目的工艺工程师id
                TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                        .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
                        .eq(TProjectTeamStaff::getRoleType, 3)
                        .last("LIMIT 1"));
                // 查询实验参与人员
                List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                        .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));
                if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
                    List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
                    query.setDispatchIds(dispatchIds);
                }
            }else {
                // 查询实验参与人员
                List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                        .eq(TExperimentDispatchParticipants::getUserId, userId));
                if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
                    List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
                    query.setDispatchIds(dispatchIds);
                }
            }
        }
        return R.ok(experimentSchemeService.auditPageList(query));
@@ -197,14 +224,21 @@
    @PostMapping(value = "/api/t-experiment-scheme/update")
    public R<Boolean> update(@RequestBody String param) {
        TExperimentSchemeDTO dto = JSON.parseObject(param,TExperimentSchemeDTO.class);

        if (Objects.equals(tokenService.getLoginUser().getUser().getRoleType(), 1)){
            dto.setStatus(null);
        }

        experimentSchemeService.updateById(dto);
        experimentSchemePersonService.remove(Wrappers.lambdaQuery(TExperimentSchemePerson.class).eq(TExperimentSchemePerson::getSchemeId,dto.getId()));
        List<TExperimentSchemePerson> experimentSchemePersons = dto.getExperimentSchemePersons();
        experimentSchemePersons.forEach(experimentSchemePerson -> {
            experimentSchemePerson.setSchemeId(dto.getId());
            experimentSchemePerson.setCommitTime(LocalDateTime.now());
        });
        experimentSchemePersonService.saveBatch(experimentSchemePersons);
        if (experimentSchemePersons != null) {
            experimentSchemePersons.forEach(experimentSchemePerson -> {
                experimentSchemePerson.setSchemeId(dto.getId());
                experimentSchemePerson.setCommitTime(LocalDateTime.now());
            });
            experimentSchemePersonService.saveBatch(experimentSchemePersons);
        }
        return R.ok();
    }

@@ -217,7 +251,6 @@
    @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);

        // 通过当前用户查询项目组
@@ -254,13 +287,17 @@
        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());

        if (!userIds.isEmpty()) {
            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);
        // 查询实验调度信息
        TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentSchemeVO.getDispatchId());
@@ -330,9 +367,18 @@
    @PostMapping(value = "/api/t-experiment-scheme/applicationTermination")
    public R<Boolean> applicationTermination(@RequestBody String param) {
        ApplicationTerminationDTO applicationTerminationDTO = JSON.parseObject(param, ApplicationTerminationDTO.class);
        TExperimentScheme currentScheme = experimentSchemeService.getById(applicationTerminationDTO.getId());
        if (Objects.isNull(currentScheme)) {
            return R.fail("实验方案不存在");
        }
        Integer oldStatus = currentScheme.getOldStatus();
        if (!Arrays.asList(2, 3, 4).contains(currentScheme.getStatus())) {
            oldStatus = currentScheme.getStatus();
        }
        experimentSchemeService.update(Wrappers.lambdaUpdate(TExperimentScheme.class)
                .eq(TExperimentScheme::getId, applicationTerminationDTO.getId())
                .set(TExperimentScheme::getStatus, 2)
                .set(TExperimentScheme::getOldStatus, oldStatus)
                .set(TExperimentScheme::getStopReason, applicationTerminationDTO.getStopReason())
                .set(TExperimentScheme::getStopFile, applicationTerminationDTO.getStopFile())
                .set(TExperimentScheme::getStopFileName, applicationTerminationDTO.getStopFileName())
@@ -356,6 +402,34 @@
        return R.ok();
    }

    @Log(title = "实验方案信息-删除中止申请", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除中止申请（保留实验方案）")
    @DeleteMapping(value = "/open/t-experiment-scheme/deleteTerminationApplication")
    public R<Boolean> deleteTerminationApplication(@RequestParam String id) {
        if (tokenService.getLoginUser().getUser().getRoleType() != 1) {
            return R.fail("仅管理员可以删除中止申请");
        }
        TExperimentScheme scheme = experimentSchemeService.getById(id);
        if (Objects.isNull(scheme)) {
            return R.fail("实验方案不存在");
        }
        if (!Arrays.asList(2, 3).contains(scheme.getStatus())) {
            return R.fail("仅待审核或已通过的实验中止审批可以删除");
        }
        Integer restoredStatus = scheme.getOldStatus() == null ? 6 : scheme.getOldStatus();
        return R.ok(experimentSchemeService.update(Wrappers.lambdaUpdate(TExperimentScheme.class)
                .eq(TExperimentScheme::getId, id)
                .set(TExperimentScheme::getStatus, restoredStatus)
                .set(TExperimentScheme::getStopReason, null)
                .set(TExperimentScheme::getStopFile, null)
                .set(TExperimentScheme::getStopFileName, null)
                .set(TExperimentScheme::getCommitSign, null)
                .set(TExperimentScheme::getAuditPersonId, null)
                .set(TExperimentScheme::getAuditTime, null)
                .set(TExperimentScheme::getAuditRemark, null)
                .set(TExperimentScheme::getOldStatus, null)));
    }

    /**
     * 批量删除实验方案
     */