zss
2024-11-26 f1ba10159c6872b859e5ab1255ed17ae644d94d7
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -244,11 +244,6 @@
            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);
    }
@@ -365,10 +360,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("该订单还未结束试验,无法生成报告!");