bug修改

xuhy

4 天以前 6bf77f70ff3396fc1b7050c9454225523f506b1f

bug修改

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

@@ -85,6 +85,9 @@
                // 查询项目组
                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())

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

@@ -88,6 +88,9 @@
                // 查询项目组
                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())

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

@@ -88,6 +88,9 @@
                // 查询项目组
                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())
@@ -130,6 +133,9 @@
                // 查询项目组
                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())

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

@@ -81,6 +81,9 @@
                // 查询项目组
                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())

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

@@ -80,8 +80,6 @@
                // 查询项目组id
                List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
                query.setTeamIds(teamIds);
            }else{
                return R.fail("当前用户未分配项目组,无法查看项目课题方案");
            }
        }
        return R.ok(projectProposalService.pageList(query));

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

@@ -89,6 +89,9 @@
                // 查询项目组
                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())

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

@@ -89,6 +89,9 @@
                // 查询项目组
                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())

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

@@ -23,6 +23,7 @@

import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -83,6 +84,9 @@
                // 查询项目组
                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())

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClinicalTrialPointsServiceImpl.java

@@ -28,6 +28,9 @@
    @Override
    public PageInfo<TClinicalTrialPointsVO> pageList(TClinicalTrialPointsQuery query) {
        PageInfo<TClinicalTrialPointsVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TClinicalTrialPointsVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentDispatchServiceImpl.java

@@ -43,6 +43,9 @@
    @Override
    public PageInfo<TExperimentDispatchVO> pageList(TExperimentDispatchQuery query) {
        PageInfo<TExperimentDispatchVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        // 查询自己已通过的实验调度
        if(Objects.nonNull(query.getOtherStatus())){
            List<TExperimentDispatchParticipants> experimentDispatchParticipants1 = experimentDispatchParticipantsMapper.selectList(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentResultReportServiceImpl.java

@@ -44,6 +44,9 @@
    @Override
    public PageInfo<TExperimentResultReportVO> pageList(TExperimentResultReportQuery query) {
        PageInfo<TExperimentResultReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TExperimentResultReportVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
@@ -116,6 +119,9 @@
    @Override
    public PageInfo<TExperimentResultReportVO> evaluatePageList(TExperimentResultReportQuery query) {
        PageInfo<TExperimentResultReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TExperimentResultReportVO> list = this.baseMapper.evaluatePageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TExperimentSchemeServiceImpl.java

@@ -39,6 +39,9 @@
    @Override
    public PageInfo<TExperimentSchemeVO> pageList(TExperimentSchemeQuery query) {
        PageInfo<TExperimentSchemeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TExperimentSchemeVO> list = this.baseMapper.pageList(query,pageInfo);
        List<String> schemeIds = list.stream().map(TExperimentSchemeVO::getId).collect(Collectors.toList());
        if(CollectionUtils.isEmpty(schemeIds)){
@@ -63,6 +66,9 @@
    @Override
    public PageInfo<TExperimentSchemeVO> auditPageList(TExperimentSchemeQuery query) {
        PageInfo<TExperimentSchemeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TExperimentSchemeVO> list = this.baseMapper.auditPageList(query,pageInfo);
        List<String> schemeIds = list.stream().map(TExperimentSchemeVO::getId).collect(Collectors.toList());
        if(CollectionUtils.isEmpty(schemeIds)){

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFeasibilityStudyReportServiceImpl.java

@@ -16,6 +16,7 @@
import org.springframework.util.CollectionUtils;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -37,6 +38,9 @@
    @Override
    public PageInfo<TFeasibilityStudyReportVO> pageList(TFeasibilityStudyReportQuery query) {
        PageInfo<TFeasibilityStudyReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TFeasibilityStudyReportVO> list = this.baseMapper.pageList(query,pageInfo);

        if(CollectionUtils.isEmpty(list)){
@@ -109,6 +113,9 @@

    @Override
    public Map<String, Integer> evaluateCount(TFeasibilityStudyReportQuery query) {
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return new HashMap<>();
        }
        Map<String, Integer> map = this.baseMapper.evaluateCount(query);
        return map;
    }

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInspectionReportServiceImpl.java

@@ -1,20 +1,16 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TInspectionReportMapper;
import com.ruoyi.system.model.TInspectionReport;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TInspectionReportQuery;
import com.ruoyi.system.service.TInspectionReportService;
import com.ruoyi.system.vo.TInspectionReportVO;
import com.ruoyi.system.vo.TProjectTeamVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -30,6 +26,9 @@
    @Override
    public PageInfo<TInspectionReportVO> pageList(TInspectionReportQuery query) {
        PageInfo<TInspectionReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TInspectionReportVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectApprovalReportServiceImpl.java

@@ -6,12 +6,10 @@
import com.ruoyi.system.model.TProjectApprovalReport;
import com.ruoyi.system.query.TProjectApprovalReportQuery;
import com.ruoyi.system.service.TProjectApprovalReportService;
import com.ruoyi.system.vo.SysOperLogVO;
import com.ruoyi.system.vo.TFeasibilityStudyReportVO;
import com.ruoyi.system.vo.TProjectApprovalReportVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.Arrays;
import java.util.List;

/**
@@ -28,6 +26,9 @@
    @Override
    public PageInfo<TProjectApprovalReportVO> pageList(TProjectApprovalReportQuery query) {
        PageInfo<TProjectApprovalReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TProjectApprovalReportVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TProjectProposalServiceImpl.java

@@ -1,20 +1,16 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TProjectProposalMapper;
import com.ruoyi.system.model.TProjectProposal;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TProjectProposalQuery;
import com.ruoyi.system.service.TProjectProposalService;
import com.ruoyi.system.vo.TProjectProposalVO;
import com.ruoyi.system.vo.TProjectTeamVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -30,6 +26,9 @@
    @Override
    public PageInfo<TProjectProposalVO> pageList(TProjectProposalQuery query) {
        PageInfo<TProjectProposalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TProjectProposalVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaProduceReportServiceImpl.java

@@ -34,6 +34,9 @@
    @Override
    public PageInfo<TQaProduceReportVO> pageList(TQaProduceReportQuery query) {
        PageInfo<TQaProduceReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TQaProduceReportVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
@@ -41,6 +44,9 @@
    @Override
    public PageInfo<TQaProduceReportVO> evaluateList(TQaProduceReportQuery query) {
        PageInfo<TQaProduceReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TQaProduceReportVO> list = this.baseMapper.evaluateList(query,pageInfo);
        if (CollectionUtils.isEmpty(list)){
            return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemReportServiceImpl.java

@@ -52,6 +52,9 @@
    @Override
    public PageInfo<TQaTestItemReportVO> pageList(TQaTestItemReportQuery query) {
        PageInfo<TQaTestItemReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TQaTestItemReportVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQaTestItemServiceImpl.java

@@ -8,6 +8,7 @@
import com.ruoyi.system.service.TQaTestItemService;
import com.ruoyi.system.vo.TQaTestItemVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

@@ -33,6 +34,9 @@
    @Override
    public PageInfo<TQaTestItemVO> evaluateList(TQaTestItemQuery query) {
        PageInfo<TQaTestItemVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TQaTestItemVO> list = this.baseMapper.evaluateList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSamplingRecordServiceImpl.java

@@ -42,6 +42,9 @@
    @Override
    public PageInfo<TSamplingRecordVO> pageList(TSamplingRecordQuery query) {
        PageInfo<TSamplingRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TSamplingRecordVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetOriginalServiceImpl.java

@@ -8,6 +8,7 @@
import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

@@ -27,6 +28,9 @@
    @Override
    public PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query) {
        PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TTestMethodConfirmSheetOriginalVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestMethodConfirmSheetServiceImpl.java

@@ -6,9 +6,9 @@
import com.ruoyi.system.model.TTestMethodConfirmSheet;
import com.ruoyi.system.query.TTestMethodConfirmSheetQuery;
import com.ruoyi.system.service.TTestMethodConfirmSheetService;
import com.ruoyi.system.vo.SysOperLogVO;
import com.ruoyi.system.vo.TTestMethodConfirmSheetVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

@@ -26,6 +26,9 @@
    @Override
    public PageInfo<TTestMethodConfirmSheetVO> pageList(TTestMethodConfirmSheetQuery query) {
        PageInfo<TTestMethodConfirmSheetVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getDispatchIds())){
            return pageInfo;
        }
        List<TTestMethodConfirmSheetVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java

@@ -27,6 +27,9 @@
    @Override
    public PageInfo<TTesterOtherTaskVO> pageList(TTesterOtherTaskQuery query) {
        PageInfo<TTesterOtherTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TTesterOtherTaskVO> list = this.baseMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java

@@ -41,6 +41,9 @@
    @Override
    public PageInfo<TResultWorkEvaluateVO> pageList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
        List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>()
                .orderByDesc(TResultWorkEvaluate::getEvaluateTime)
@@ -228,6 +231,9 @@
    @Override
    public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TResultWorkEvaluateVO> list = this.baseMapper.chemistEvaluateList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;
@@ -249,6 +255,9 @@
    @Override
    public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) {
        PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        if(CollectionUtils.isEmpty(query.getTeamIds())){
            return pageInfo;
        }
        List<TResultWorkEvaluateVO> list = this.baseMapper.testerEvaluateList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){
            return pageInfo;