1.0版本验收时，遗留的新增项，实验结果汇报增加原始检验记录

xuhy

2025-12-09 9f480a6addb804f667041224b5d527584a690c9b

1.0版本验收时，遗留的新增项，实验结果汇报增加原始检验记录

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

@@ -13,11 +13,10 @@
import com.ruoyi.system.dto.TExperimentResultReportRejectDTO;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.OriginalPageListQuery;
import com.ruoyi.system.query.TExperimentResultReportQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TExperimentDispatchVO;
import com.ruoyi.system.vo.TExperimentResultReportVO;
import com.ruoyi.system.vo.TExperimentSchemeVO;
import com.ruoyi.system.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -56,8 +55,11 @@
    private final TExperimentDispatchService experimentDispatchService;
    private final TProjectProposalService projectProposalService;
    private final TNoticeService noticeService;
    private final TTestMethodConfirmSheetService testMethodConfirmSheetService;
    private final TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService;
    private final TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService;
    @Autowired
    public TExperimentResultReportController(TExperimentResultReportService experimentResultReportService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TResultWorkEvaluateService resultWorkEvaluateService, TExperimentSchemeService experimentSchemeService, TInspectionReportService inspectionReportService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TNoticeService noticeService) {
    public TExperimentResultReportController(TExperimentResultReportService experimentResultReportService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TResultWorkEvaluateService resultWorkEvaluateService, TExperimentSchemeService experimentSchemeService, TInspectionReportService inspectionReportService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TNoticeService noticeService, TTestMethodConfirmSheetService testMethodConfirmSheetService, TTestMethodConfirmSheetTermService testMethodConfirmSheetTermService, TTestMethodConfirmSheetOriginalService testMethodConfirmSheetOriginalService) {
        this.experimentResultReportService = experimentResultReportService;
        this.tokenService = tokenService;
        this.sysUserService = sysUserService;
@@ -71,6 +73,9 @@
        this.experimentDispatchService = experimentDispatchService;
        this.projectProposalService = projectProposalService;
        this.noticeService = noticeService;
        this.testMethodConfirmSheetService = testMethodConfirmSheetService;
        this.testMethodConfirmSheetTermService = testMethodConfirmSheetTermService;
        this.testMethodConfirmSheetOriginalService = testMethodConfirmSheetOriginalService;
    }

    /**
@@ -259,7 +264,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:edit')")
    @Log(title = "实验结果汇报信息-评定工艺工程师实验-驳回实验结果汇报", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "评定工艺工程师实验-驳回实验结果汇报",response = TResultWorkEvaluate.class)
    @ApiOperation(value = "评定工艺工程师实验-驳回实验结果汇报",response = TExperimentResultReportRejectDTO.class)
    @PostMapping(value = "/api/t-experiment-result-report/rejectResult")
    public R<Boolean> rejectResult(@RequestBody String param) {
        TExperimentResultReportRejectDTO experimentResultReportRejectDTO = JSON.parseObject(param,TExperimentResultReportRejectDTO.class);
@@ -396,6 +401,18 @@
    }

    /**
     * 通过实验调度id获取原始检验记录列表
     */
    //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:detail')")
    @ApiOperation(value = "通过实验调度id获取原始检验记录列表",response = OriginalPageListQuery.class)
    @PostMapping(value = "/api/t-experiment-result-report/getOriginalPageListByDispatchId")
    public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> getOriginalPageListByDispatchId(@RequestBody String param) {
        OriginalPageListQuery query = JSON.parseObject(param,OriginalPageListQuery.class);
        PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = testMethodConfirmSheetOriginalService.getOriginalPageListByDispatchId(query);
        return R.ok(pageInfo);
    }

    /**
     * 提交接口
     */
    //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:detail')")

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

@@ -118,9 +118,10 @@
    @PostMapping(value = "/api/t-inspection-report/add")
    public R<Boolean> add(@RequestBody String param) {
        TInspectionReportDTO dto = JSON.parseObject(param,TInspectionReportDTO.class);
        Long userId = tokenService.getLoginUser().getUserId();
        dto.setCommitUserId(userId);
        inspectionReportService.save(dto);
        // 通过当前用户查询项目组
        Long userId = tokenService.getLoginUser().getUserId();
        TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
                .eq(TProjectTeamStaff::getUserId, userId)
                .last("LIMIT 1"));

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

@@ -90,6 +90,7 @@
        TResultWorkEvaluateQuery query = JSON.parseObject(param, TResultWorkEvaluateQuery.class);
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if(roleType != 1){
            // 查询用户所在项目组
            List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -98,6 +99,9 @@
                // 查询项目组id
                List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
                query.setTeamIds(teamIds);
            }
            if(roleType == 4){
                query.setUserId(userId);
            }
        }
        return R.ok(tResultWorkEvaluateService.chemistEvaluateList(query));
@@ -113,6 +117,7 @@
        TResultWorkEvaluateQuery query = JSON.parseObject(param, TResultWorkEvaluateQuery.class);
        Long userId = tokenService.getLoginUser().getUserId();
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        query.setRoleType(roleType);
        if(roleType != 1){
            // 查询用户所在项目组
            List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -122,6 +127,9 @@
                List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
                query.setTeamIds(teamIds);
            }
            if(roleType == 5){
                query.setUserId(userId);
            }
        }
        return R.ok(tResultWorkEvaluateService.testerEvaluateList(query));
    }

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

@@ -2,6 +2,7 @@


import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
@@ -269,8 +270,16 @@
        TSamplingRecordVO samplingRecordVO = new TSamplingRecordVO();
        BeanUtils.copyProperties(samplingRecord, samplingRecordVO);

        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        Long userId = tokenService.getLoginUser().getUserId();
        LambdaQueryWrapper<TSamplingRecordOperation> wrapper = new LambdaQueryWrapper<>();
        if(roleType == 4){
            // 化验师只查看自己接收得数据
            wrapper.eq(TSamplingRecordOperation::getReceiptsPersonId,userId );
        }
        wrapper.eq(TSamplingRecordOperation::getSamplingId, id);
        // 查询取样操作记录
        List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id));
        List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(wrapper);

        List<Long> userIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getHandlePersonId).collect(Collectors.toList());
        List<Long> sendUserIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getSendPersonId).collect(Collectors.toList());
@@ -278,17 +287,26 @@
        userIds.addAll(sendUserIds);
        userIds.addAll(receiptsUserIds);
        List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
        samplingRecordOperations.forEach(samplingRecordOperation -> {
        for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
            if(Objects.nonNull(samplingRecordOperation.getHandlePersonId())){
                samplingRecordOperation.setHandlePersonName(Objects.requireNonNull(sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).findFirst().orElse(null)).getNickName());
                List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(users)){
                    samplingRecordOperation.setHandlePersonName(users.get(0).getNickName());
                }
            }
            if(Objects.nonNull(samplingRecordOperation.getSendPersonId())){
                samplingRecordOperation.setSendPersonName(Objects.requireNonNull(sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).findFirst().orElse(null)).getNickName());
                List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(users)){
                    samplingRecordOperation.setSendPersonName(users.get(0).getNickName());
                }
            }
            if(Objects.nonNull(samplingRecordOperation.getReceiptsPersonId())){
                samplingRecordOperation.setReceiptsPersonName(Objects.requireNonNull(sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).findFirst().orElse(null)).getNickName());
                List<SysUser> users = sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(users)){
                    samplingRecordOperation.setReceiptsPersonName(users.get(0).getNickName());
                }
            }
        });
        }

        samplingRecordVO.setSamplingRecordOperations(samplingRecordOperations);
        // 查询实验调度信息
@@ -306,6 +324,11 @@
            });
            String participantsName = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getNickName).collect(Collectors.joining(";"));
            experimentDispatch.setParticipantsName(participantsName);

            // 返回化验师列表
            List<TExperimentDispatchParticipants> experimentDispatchParticipantChemists = tExperimentDispatchParticipants.stream().
                    filter(a -> a.getRoleType().equals(4)).collect(Collectors.toList());
            experimentDispatch.setExperimentDispatchParticipantChemists(experimentDispatchParticipantChemists);
            // 查询课题方案名称
            TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
            if(Objects.nonNull(projectProposal)){
@@ -352,29 +375,26 @@
    public R<Boolean> batchSendSamples(@RequestBody String param) {
        BatchSendSamplesDTO batchSendSamplesDTO = JSON.parseObject(param, BatchSendSamplesDTO.class);
        Long userId = tokenService.getLoginUser().getUserId();
        List<String> ids = batchSendSamplesDTO.getRecordOperationId();
        // 批量送样
        List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class)
                .in(TSamplingRecordOperation::getId, ids));
        List<TSamplingRecordOperation> samplingRecordOperations = batchSendSamplesDTO.getRecordOperationList();
        for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
            samplingRecordOperation.setStatus(2);
            samplingRecordOperation.setSendPersonId(userId);
            samplingRecordOperation.setSendSign(samplingRecordOperation.getSendSign());
            samplingRecordOperation.setSendTime(LocalDateTime.now());
        }
        samplingRecordOperationService.updateBatchById(samplingRecordOperations);

        // 查询取样记录信息
        TSamplingRecord samplingRecord = samplingRecordService.getById(samplingRecordOperations.get(0).getSamplingId());
//        TSamplingRecord samplingRecord = samplingRecordService.getById(samplingRecordOperations.get(0).getSamplingId());
        // 查询实验调度
        TExperimentDispatch experimentDispatch = experimentDispatchService.getById(samplingRecord.getDispatchId());
//        TExperimentDispatch experimentDispatch = experimentDispatchService.getById(samplingRecord.getDispatchId());
        // 查询实验调度参与人员
        List<TExperimentDispatchParticipants> teamStaffs = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
                .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId())
                .eq(TExperimentDispatchParticipants::getRoleType, 4));
//        List<TExperimentDispatchParticipants> teamStaffs = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
//                .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId())
//                .eq(TExperimentDispatchParticipants::getRoleType, 4));
        // MESSAGE 添加消息
        teamStaffs.forEach(teamStaff -> {
            noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【送样单】等待确认接收样品", tokenService.getLoginUser().getUser().getNickName(),13);
        samplingRecordOperations.forEach(samplingRecordOperation -> {
            noticeService.saveNotice(samplingRecordOperation.getReceiptsPersonId(), "您有【1】条【送样单】等待确认接收样品", tokenService.getLoginUser().getUser().getNickName(),13);
        });
        return R.ok();
    }
@@ -388,14 +408,14 @@
    @PostMapping(value = "/open/t-sampling-record/batchCollectSamples")
    public R<Boolean> batchCollectSamples(@RequestBody String param) {
        BatchCollectSamplesDTO batchCollectSamplesDTO = JSON.parseObject(param, BatchCollectSamplesDTO.class);
        Long userId = tokenService.getLoginUser().getUserId();
//        Long userId = tokenService.getLoginUser().getUserId();
        List<String> ids = batchCollectSamplesDTO.getRecordOperationId();
        // 批量送样
        List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class)
                .in(TSamplingRecordOperation::getId, ids));
        for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) {
            samplingRecordOperation.setStatus(3);
            samplingRecordOperation.setReceiptsPersonId(userId);
//            samplingRecordOperation.setReceiptsPersonId(userId);
            samplingRecordOperation.setReceiptsSign(samplingRecordOperation.getReceiptsSign());
            samplingRecordOperation.setReceiptsTime(LocalDateTime.now());
        }

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

@@ -183,6 +183,7 @@
            originalCode = originalCode + String.format("%02d", count+1);
            testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
            testMethodConfirmSheetOriginal.setStatus(1);
            testMethodConfirmSheetOriginal.setCommitUserId(userId);
            testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
        }

@@ -342,7 +343,7 @@
    }

    /**
     * 批量删除检验方法确认单
     * 检验方法确认单签字
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:sign')")
    @Log(title = "检验方法确认单信息-检验方法确认单签字", businessType = BusinessType.UPDATE)

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

@@ -68,10 +68,10 @@
    }

    /**
     * 获取检验方法确认单管理列表
     * 获取检验方法确认单原始检测项分页列表
     */
    //@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheetOriginal:list')")
    @ApiOperation(value = "获取检验方法确认单分页列表",  notes = "获取检验方法确认单分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
    @ApiOperation(value = "获取检验方法确认单原始检测项分页列表",  notes = "获取检验方法确认单原始检测项分页列表",response = TTestMethodConfirmSheetOriginalQuery.class)
    @PostMapping(value = "/api/t-test-method-confirm-sheet-original/pageList")
    public R<PageInfo<TTestMethodConfirmSheetOriginalVO>> pageList(@RequestBody String param) {
        TTestMethodConfirmSheetOriginalQuery query = JSON.parseObject(param, TTestMethodConfirmSheetOriginalQuery.class);

 ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchSendSamplesDTO.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.dto;

import com.ruoyi.system.model.TSamplingRecordOperation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,10 +12,7 @@
@ApiModel(value = "批量送样DTO")
public class BatchSendSamplesDTO implements Serializable {

    @ApiModelProperty(value = "取样操作记录id")
    private List<String> recordOperationId;

    @ApiModelProperty(value = "送样签字")
    private String sendSign;
    @ApiModelProperty(value = "批量送样对象")
    private List<TSamplingRecordOperation> recordOperationList;

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTestMethodConfirmSheetOriginalMapper.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
import com.ruoyi.system.query.OriginalPageListQuery;
import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
import org.apache.ibatis.annotations.Param;
@@ -28,4 +28,11 @@
     */
    List<TTestMethodConfirmSheetOriginalVO> pageList(@Param("query") TTestMethodConfirmSheetOriginalQuery query, @Param("pageInfo")PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo);

    /**
     * 通过调度id查询原始检测项
     * @param query
     * @param pageInfo
     * @return
     */
    List<TTestMethodConfirmSheetOriginalVO> getOriginalPageListByDispatchId(@Param("query")OriginalPageListQuery query, @Param("pageInfo")PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java

@@ -12,6 +12,7 @@
import lombok.EqualsAndHashCode;

import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
@@ -82,4 +83,7 @@
    @TableField(exist = false)
    private String participantsName;

    @ApiModelProperty(value = "化验师参与人员")
    @TableField(exist = false)
    private List<TExperimentDispatchParticipants> experimentDispatchParticipantChemists;
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TInspectionReport.java

@@ -1,14 +1,14 @@
package com.ruoyi.system.model;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
@@ -45,4 +45,8 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "提交人id")
    @TableField("commit_user_id")
    private Long commitUserId;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheetOriginal.java

@@ -61,5 +61,9 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "提交人id")
    @TableField("commit_user_id")
    private Long commitUserId;


}

 ruoyi-system/src/main/java/com/ruoyi/system/query/OriginalPageListQuery.java

New file
@@ -0,0 +1,26 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel(value = "原始分页列表查询参数OriginalPageListQuery")
public class OriginalPageListQuery extends BasePage {

    @ApiModelProperty(value = "调度id")
    private String dispatchId;

    @ApiModelProperty(value = "创建人")
    private String createBy;

    @ApiModelProperty(value = "检测项名称")
    private String termName;

    @ApiModelProperty(value = "检测项id集合")
    private List<String> termIds;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TResultWorkEvaluateQuery.java

@@ -24,5 +24,8 @@
    private Integer status;
    @ApiModelProperty(value = "当前登陆人所属项目组List 前端忽略")
    private List<String> teamIds;

    @ApiModelProperty(value = "用户id,前端忽略")
    private Long userId;
    @ApiModelProperty(value = "用户类型,前端忽略")
    private Integer roleType;
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TTestMethodConfirmSheetOriginalService.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
import com.ruoyi.system.query.OriginalPageListQuery;
import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;

@@ -23,4 +23,11 @@
     * @return
     */
    PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query);

    /**
     * 获取检验方法确认单分页列表
     * @param query
     * @return
     */
    PageInfo<TTestMethodConfirmSheetOriginalVO> getOriginalPageListByDispatchId(OriginalPageListQuery query);
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TTestMethodConfirmSheetMapper;
import com.ruoyi.system.mapper.TTestMethodConfirmSheetOriginalMapper;
import com.ruoyi.system.mapper.TTestMethodConfirmSheetTermMapper;
import com.ruoyi.system.model.TTestMethodConfirmSheet;
import com.ruoyi.system.model.TTestMethodConfirmSheetOriginal;
import com.ruoyi.system.model.TTestMethodConfirmSheetTerm;
import com.ruoyi.system.query.OriginalPageListQuery;
import com.ruoyi.system.query.TTestMethodConfirmSheetOriginalQuery;
import com.ruoyi.system.service.TTestMethodConfirmSheetOriginalService;
import com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

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

/**
 * <p>
@@ -23,7 +33,10 @@
@Service
public class TTestMethodConfirmSheetOriginalServiceImpl extends ServiceImpl<TTestMethodConfirmSheetOriginalMapper, TTestMethodConfirmSheetOriginal> implements TTestMethodConfirmSheetOriginalService {


    @Autowired
    private TTestMethodConfirmSheetMapper testMethodConfirmSheetMapper;
    @Autowired
    private TTestMethodConfirmSheetTermMapper tTestMethodConfirmSheetTermMapper;

    @Override
    public PageInfo<TTestMethodConfirmSheetOriginalVO> pageList(TTestMethodConfirmSheetOriginalQuery query) {
@@ -35,4 +48,39 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public PageInfo<TTestMethodConfirmSheetOriginalVO> getOriginalPageListByDispatchId(OriginalPageListQuery query) {

        PageInfo<TTestMethodConfirmSheetOriginalVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());

        // 通过调度id查询实验方法确认单
        List<TTestMethodConfirmSheet> testMethodConfirmSheets = testMethodConfirmSheetMapper.selectList(Wrappers.lambdaQuery(TTestMethodConfirmSheet.class)
                .eq(TTestMethodConfirmSheet::getDispatchId, query.getDispatchId()));

        if(CollectionUtils.isEmpty(testMethodConfirmSheets)){
            return pageInfo;
        }

        // 查询检验方法确认单检测项
        LambdaQueryWrapper<TTestMethodConfirmSheetTerm> wrapper = new LambdaQueryWrapper<>();
        // 通过检测项名称查询
        if(StringUtils.isNotBlank(query.getTermName())){
            wrapper.like(TTestMethodConfirmSheetTerm::getTermName,query.getTermName());
        }
        List<String> sheetIds = testMethodConfirmSheets.stream().map(TTestMethodConfirmSheet::getId).collect(Collectors.toList());
        wrapper.in(TTestMethodConfirmSheetTerm::getTestId, sheetIds);
        List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = tTestMethodConfirmSheetTermMapper.selectList(wrapper);

        if(CollectionUtils.isEmpty(testMethodConfirmSheetTerms)){
            return pageInfo;
        }

        List<String> termIds = testMethodConfirmSheetTerms.stream().map(TTestMethodConfirmSheetTerm::getId).collect(Collectors.toList());
        query.setTermIds(termIds);

        List<TTestMethodConfirmSheetOriginalVO> list = this.baseMapper.getOriginalPageListByDispatchId(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/OriginalPageListVO.java

New file
@@ -0,0 +1,12 @@
package com.ruoyi.system.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "原始数据分页列表OriginalPageListVO")
public class OriginalPageListVO extends TTestMethodConfirmSheetOriginalVO {



}

 ruoyi-system/src/main/resources/mapper/system/TInspectionReportMapper.xml

@@ -9,6 +9,7 @@
        <result column="test_result" property="testResult" />
        <result column="test_reason" property="testReason" />
        <result column="status" property="status" />
        <result column="commit_user_id" property="commitUserId" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -18,11 +19,12 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, dispatch_id, test_result, test_reason, status, create_time, update_time, create_by, update_by, disabled
        id, dispatch_id, test_result, test_reason, status,commit_user_id, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TInspectionReportVO">
        select tir.id, tir.dispatch_id, tir.test_result, tir.test_reason, tir.status, tir.create_time,
        tir.update_time, tir.create_by, tir.update_by, tir.disabled,  ted.experiment_name, ted.experiment_code,
        tir.update_time, tir.create_by, tir.update_by, tir.disabled, tir.commit_user_id,
        ted.experiment_name, ted.experiment_code,
        tpp.project_name
        from t_inspection_report tir
        left join t_experiment_dispatch ted on ted.id = tir.dispatch_id
@@ -43,6 +45,9 @@
            <if test="query.status != null">
                and tir.status = #{query.status}
            </if>
            <if test="query.roleType != null and query.roleType == 4 and query.userId != null">
                AND tir.commit_user_id = #{query.userId}
            </if>
            <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
                and tir.dispatch_id in
                <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">

 ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml

@@ -84,6 +84,9 @@
            <if test="query.status != null">
                AND trwe.status = #{query.status}
            </if>
            <if test="query.roleType != null and query.roleType == 4 and query.userId != null">
                AND trwe.user_id = #{query.userId}
            </if>
            <if test="query.teamIds != null and query.teamIds.size() > 0">
                AND trwe.team_id in
                <foreach collection="query.teamIds" item="id" open="(" separator="," close=")">
@@ -120,6 +123,9 @@
            <if test="query.status != null">
                AND trwe.status = #{query.status}
            </if>
            <if test="query.roleType != null and query.roleType == 5 and query.userId != null">
                AND trwe.user_id = #{query.userId}
            </if>
            <if test="query.teamIds != null and query.teamIds.size() > 0">
                AND trwe.team_id in
                <foreach collection="query.teamIds" item="id" open="(" separator="," close=")">

 ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetMapper.xml

@@ -44,8 +44,8 @@
            <if test="query.auditStatus != null">
                and tmcs.audit_status = #{query.auditStatus}
            </if>
            <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
                AND tmcs.audit_status != 5
            <if test="query.roleType != null and query.roleType == 4 and query.userId != null">
                AND tmcs.commit_user_id = #{query.userId}
            </if>
            <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
                and tmcs.dispatch_id in
@@ -56,6 +56,9 @@
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND tmcs.create_time BETWEEN #{query.startTime} AND #{query.endTime}
            </if>
            <if test="query.roleType != null and (query.roleType == 3 or query.roleType == 4 or query.roleType == 5)">
                AND tmcs.audit_status != 5
            </if>
            <if test="query.auditStatus == null">
                and tmcs.audit_status != -1
            </if>

 ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml

@@ -13,6 +13,7 @@
        <result column="term_step" property="termStep" />
        <result column="term_result" property="termResult" />
        <result column="status" property="status" />
        <result column="commit_user_id" property="commitUserId" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_by" property="createBy" />
@@ -22,12 +23,14 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, term_id, original_code, term_standard, term_instrument, term_reagent, term_step, term_result, status, create_time, update_time, create_by, update_by, disabled
        id, term_id, original_code, term_standard, term_instrument, term_reagent, term_step,
          term_result, status,commit_user_id, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO">
        select ttmcso.id, ttmcso.term_id, ttmcso.original_code, ttmcso.term_standard, ttmcso.term_instrument, ttmcso.term_reagent,
               ttmcso.term_step, ttmcso.term_result, ttmcso.status, ttmcso.create_time, ttmcso.update_time, ttmcso.create_by,
               ttmcso.update_by, ttmcso.disabled,tpp.project_name AS projectName,ted.experiment_code AS experimentCode,
               ttmcso.update_by, ttmcso.disabled,ttmcso.commit_user_id,
               tpp.project_name AS projectName,ted.experiment_code AS experimentCode,
               ted.experiment_name AS experimentName,ttmcst.term_name AS termName,ttmcst.term_code AS termCode
        from t_test_method_confirm_sheet_original ttmcso
        left join t_test_method_confirm_sheet_term ttmcst on ttmcso.term_id = ttmcst.id
@@ -47,6 +50,9 @@
            <if test="query.status != null">
                and ttmcso.status = #{query.status}
            </if>
            <if test="query.roleType != null and query.roleType == 4 and query.userId != null">
                AND ttmcso.commit_user_id = #{query.userId}
            </if>
            <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
                and ttmcs.dispatch_id in
                <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
@@ -63,5 +69,32 @@
        </where>
        ORDER BY ttmcso.create_time DESC
    </select>
    <select id="getOriginalPageListByDispatchId"
            resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO">
        select ttmcso.id, ttmcso.term_id, ttmcso.original_code, ttmcso.term_standard, ttmcso.term_instrument, ttmcso.term_reagent,
        ttmcso.term_step, ttmcso.term_result, ttmcso.status, ttmcso.create_time, ttmcso.update_time, ttmcso.create_by,
        ttmcso.update_by, ttmcso.disabled,ttmcso.commit_user_id,
        tpp.project_name AS projectName,ted.experiment_code AS experimentCode,
        ted.experiment_name AS experimentName,ttmcst.term_name AS termName,ttmcst.term_code AS termCode
        from t_test_method_confirm_sheet_original ttmcso
        left join t_test_method_confirm_sheet_term ttmcst on ttmcso.term_id = ttmcst.id
        left join t_test_method_confirm_sheet ttmcs on ttmcst.test_id = ttmcs.id
        left join t_experiment_dispatch ted on ttmcs.dispatch_id = ted.id
        left join t_project_proposal tpp on ted.proposal_id = tpp.id
        <where>
            <if test="query.createBy != null and query.createBy != ''">
                and ttmcso.create_by like concat('%', #{query.createBy}, '%')
            </if>
            <if test="query.termIds != null and query.termIds.size() > 0">
                and ttmcso.term_id in
                <foreach item="item" collection="query.termIds" separator="," close=")" index="index" open="(">
                    #{item}
                </foreach>
            </if>
            and ttmcso.status = 2
            AND ttmcso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY ttmcso.create_time DESC
    </select>

</mapper>