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

xuhy

2025-12-09 9f480a6addb804f667041224b5d527584a690c9b

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

@@ -1,19 +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.service.TTestMethodConfirmSheetTermService;
import com.ruoyi.system.vo.TExperimentResultReportVO;
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>
@@ -26,11 +33,54 @@
@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) {
        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;
    }

    @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;
    }
}