Merge remote-tracking branch 'origin/dev' into dev

lxp

2025-03-15 5a697e6fafbe3855336ca5fd7e1785de12840d16

 inspect-server/src/main/java/com/ruoyi/inspect/handler/TemperatureTestReportHandler.java

文件名从 cnas-require/src/main/java/com/ruoyi/require/handler/TemperatureTestReportHandler.java 修改
@@ -1,4 +1,4 @@
package com.ruoyi.require.handler;
package com.ruoyi.inspect.handler;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.deepoove.poi.data.*;
import com.deepoove.poi.data.style.*;

import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.SampleProductDto;
import com.ruoyi.inspect.mapper.InsProductMapper;
@@ -34,7 +35,7 @@

    private final InsProductResultMapper insProductResultMapper;

    public TemperatureTestReportHandler(InsProductMapper insProductMapper, InsProductResultMapper insProductResultMapper){
    public TemperatureTestReportHandler(InsProductMapper insProductMapper,InsProductResultMapper insProductResultMapper){
        this.insProductMapper = insProductMapper;
        this.insProductResultMapper = insProductResultMapper;
    }
@@ -325,7 +326,7 @@
                            }
                        }
                        rowRenderData.setCells(cells);
                        if (rowRenderData.getCells().size() != 0) {
                        if (!rowRenderData.getCells().isEmpty()) {
                            rows.add(rowRenderData);
                        }
                    }
@@ -333,10 +334,6 @@
                    tableRenderData.setRows(rows);
                    int countSize = tableRenderData.getRows().get(0).getCells().size();
                    for (RowRenderData row : tableRenderData.getRows()) {
                            /*for (CellRenderData cell : row.getCells()) {
                                System.out.print(cell.getParagraphs().get(0).getContents());
                            }
                            System.out.println("");*/
                        if (row.getCells().size() != countSize) {
                            throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑5");
                        }