Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after

chenrui

2025-03-24 c8355d4a1f27716edc510d936b6a7982b0ab99b3

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java

@@ -41,6 +41,7 @@
import org.apache.logging.log4j.util.Strings;
import org.apache.poi.xwpf.usermodel.*;
import org.apache.poi.xwpf.usermodel.ParagraphAlignment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
@@ -84,6 +85,9 @@

    @Resource
    private InsReportMapper insReportMapper;

    @Autowired
    ProcessReportMapper1 processReportMapper;

    @Value("${wordUrl}")
    private String wordUrl;
@@ -226,6 +230,7 @@
            insReport.setState(0);//提交状态改为待提交
            return insReportMapper.updateById(insReport);
        }
        insReportMapper.updateById(insReport);
        //获取批准人的签名地址
        String signatureUrl;
        try {
@@ -244,12 +249,11 @@
            put("seal2", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
        }}, finalUrl);
        wordToPdf(finalUrl, sealUrl);

        InsOrder insOrder = new InsOrder();
        insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
        insOrder.setState(4);
        insOrderMapper.updateById(insOrder);
        return insReportMapper.updateById(insReport);
        /*新增cnas7.8报告结果*/
        ProcessReport processReport = new ProcessReport();
        processReport.setInsReportCode(insReport.getCode());
        processReportMapper.insert(processReport);
        return 0;
    }

    @Override
@@ -365,10 +369,10 @@
            if (insReportDto.getState() == 1) {
                List<InsReportDto1> insReportDto1s = insReportDto.getInsReportDto1s();
                for (InsReportDto1 insReportDto1 : insReportDto1s) {
                    wordUtils.generateReport(insReportDto.getId(), insReportDto1);
                    if (ObjectUtils.isNotEmpty(insReportDto1.getInsReportDto2s())) {
                        wordUtils.generateReport(insReportDto.getId(), insReportDto1);
                    }
                }
            } else {
               //如果不生成就一直挂着
            }
        } else {
            throw new ErrorException("该订单还未结束试验,无法生成报告!");
@@ -378,16 +382,15 @@

    //查出该订单下每个站点下的检验次数
    @Override
    public List<InsOrderStateDto> getInsOrderStateCount(Integer id) {
    public List<InsOrderStateDto> getInsOrderStateCount(Integer id, Integer sampleId) {
        List<InsOrderStateDto> insOrderStateDtos = new ArrayList<>();
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, id));
        for (InsSample insSample : insSamples) {
            InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
            insOrderStateDto.setInsSample(insSample);
            List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
            insOrderStateDto.setInsOrderStates(insOrderStates);
            insOrderStateDtos.add(insOrderStateDto);
        }
        InsSample insSample = insSampleMapper.selectById(sampleId);
        InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
        insOrderStateDto.setInsSample(insSample);
        List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
        insOrderStateDto.setInsOrderStates(insOrderStates);
        insOrderStateDtos.add(insOrderStateDto);

        return insOrderStateDtos;
    }