From 95e3d91f19763a7d96c0f084bf8fcd31ea8e5896 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 13 七月 2024 21:11:05 +0800
Subject: [PATCH] 光纤接头损耗

---
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 2118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 1,989 insertions(+), 129 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 0570e78..58fbd36 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -499,6 +499,11 @@
                     insSample.setInsState(2);
                 }
                 insSampleMapper.updateById(insSample);
+                /*鏍￠獙涓�涓媟esult琛�*/
+                List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()).orderByDesc(InsProductResult::getId));
+                if (insProductResults.size() > 1) {
+                    insProductResultMapper.deleteById(insProductResults.get(0));
+                }
             });
             return insContext.keySet().stream().findFirst().orElse(null);
         }).thenAccept(res -> {
@@ -545,6 +550,7 @@
         if (count == 0 && num == 5) {
             List<InsUnPass> insUnPasses = new ArrayList<>();
             /*鏍峰搧涓嬬殑椤圭洰鍙鏈変竴涓」鐩笉鍚堟牸鍒欐楠岀粨鏋滀负0,鍚﹀垯涓�1*/
+            //杩欓噷鐨刬nsSamples鏄鍗曚笅鐨勬墍鏈夋牱鍝佸寘鎷�("/")
             List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId));
             for (InsSample insSample : insSamples) {
                 List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, insSample.getId()).eq(InsProduct::getState, 1));
@@ -576,6 +582,7 @@
             insUnPassService.saveBatch(insUnPasses);
             InsOrder insOrder = insOrderMapper.selectById(orderId);
             Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
+            //samples鏄笉鍖呮嫭甯︽湁"/"鐨勬牱鍝�
             List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
             InsReport insReport = new InsReport();
             insReport.setCode(insOrder.getEntrustCode());
@@ -588,6 +595,7 @@
             String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
             AtomicReference<String> resultCh = new AtomicReference<>("");
             AtomicReference<String> resultEn = new AtomicReference<>("");
+            /*鍩虹鎶ュ憡(鏍规嵁缁樺埗鐨勫師濮嬭褰曟ā鐗堝舰鎴�)*/
             samples.forEach(a -> {
                 Set<Integer> set = new HashSet<>();
                 Map<Integer, String> map2 = new HashMap<>();
@@ -663,19 +671,19 @@
                             int count3 = 0;
                             String str = "";
                             String s = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
-                            if ("妫�楠屽��".equals(s) || "璁惧鍚嶇О".equals(s) || "璁惧缂栫爜".equals(s) || "璇曢獙鏂规硶".equals(s) || "妫�娴嬫柟娉�".equals(s)) {
+                            if (s.contains("妫�楠屽��") || s.contains("璁惧鍚嶇О") || s.contains("璁惧缂栫爜") || s.contains("璇曢獙鏂规硶") || s.contains("妫�娴嬫柟娉�")) {
                                 delSet.add(jo1.get("c") + "");
                                 continue;
                             }
                             for (JSONObject jo2 : temp) {
                                 JSONObject v2 = JSON.parseObject(JSON.toJSONString(jo2.get("v")));
                                 if (jo1.get("r").equals(jo2.get("r"))) {
-                                    if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠岄」")) {
+                                    if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").toString().contains("妫�楠岄」")) {
                                         if (count3 == 0) {
                                             str += v2.get("v");
                                             count3 += 1;
                                         }
-                                    } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").equals("妫�楠屽瓙椤�")) {
+                                    } else if (v2.get("ps") != null && JSON.parseObject(JSON.toJSONString(v2.get("ps"))).get("value").toString().contains("妫�楠屽瓙椤�")) {
                                         if (count3 == 1) {
                                             str += v2.get("v");
                                             count3 += 1;
@@ -720,11 +728,11 @@
                         InsProduct p = pMap.get(jo1.get("r") + "");
                         if (p != null && v.get("ps") != null) {
                             String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
-                            if (value.equals("瑕佹眰鍊�")) {
+                            if (value.contains("瑕佹眰鍊�")) {
                                 textRenderData.setText(ObjectUtils.isNotEmpty(p.getTell()) ? p.getTell() : "");
-                            } else if (value.equals("鍗曚綅")) {
+                            } else if (value.contains("鍗曚綅")) {
                                 textRenderData.setText(p.getUnit());
-                            } else if (value.equals("缁撹")) {
+                            } else if (value.contains("缁撹")) {
                                 switch (p.getInsResult()) {
                                     case 1:
                                         textRenderData.setText("鈭�");
@@ -738,35 +746,35 @@
                                         textRenderData.setText("-");
                                         break;
                                 }
-                            } else if (value.equals("搴忓彿")) {
+                            } else if (value.contains("搴忓彿")) {
                                 if (itemSet.add(p.getInspectionItem())) {
                                     index.getAndIncrement();
                                 }
                                 textRenderData.setText(index + "");
-                            } else if (value.equals("璁＄畻鍊�")) {
+                            } else if (value.contains("璁＄畻鍊�")) {
                                 JSONArray jsonArray = JSON.parseArray(p.getInsProductResult().getComValue());
                                 textRenderData.setText((JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "").equals("") ? "/" : JSON.parseObject(JSON.toJSONString(jsonArray.get(0))).get("v") + "");
-                            } else if (value.equals("鏈�缁堝��")) {
+                            } else if (value.contains("鏈�缁堝��")) {
                                 textRenderData.setText(p.getLastValue());
-                            } else if (value.equals("鏍峰搧缂栧彿")) {
+                            } else if (value.contains("鏍峰搧缂栧彿")) {
                                 textRenderData.setText(a.getSampleCode());
-                            } else if (value.equals("鏍峰搧鍨嬪彿")) {
+                            } else if (value.contains("鏍峰搧鍨嬪彿")) {
                                 textRenderData.setText(a.getModel());
-                            } else if (value.equals("鏍峰搧鍚嶇О")) {
+                            } else if (value.contains("鏍峰搧鍚嶇О")) {
                                 textRenderData.setText(a.getSample());
-                            } else if (value.equals("璇曢獙鏂规硶")) {
+                            } else if (value.contains("璇曢獙鏂规硶")) {
                                 textRenderData.setText(p.getMethodS());
-                            } else if (value.equals("妫�楠岄」")) {
+                            } else if (value.contains("妫�楠岄」")) {
                                 if (ObjectUtils.isEmpty(p.getInspectionItemEn())) {
                                     textRenderData.setText(p.getInspectionItem());
                                 } else {
-                                    textRenderData.setText(p.getInspectionItem() + "&" + p.getInspectionItemEn());
+                                    textRenderData.setText(p.getInspectionItem() + "@" + p.getInspectionItemEn());
                                 }
-                            } else if (value.equals("妫�楠屽瓙椤�")) {
+                            } else if (value.contains("妫�楠屽瓙椤�")) {
                                 if (ObjectUtils.isEmpty(p.getInspectionItemSubclassEn())) {
                                     textRenderData.setText(p.getInspectionItemSubclass());
                                 } else {
-                                    textRenderData.setText(p.getInspectionItemSubclass() + "&" + p.getInspectionItemSubclassEn());
+                                    textRenderData.setText(p.getInspectionItemSubclass() + "@" + p.getInspectionItemSubclassEn());
                                 }
                             } else {
                                 textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
@@ -774,9 +782,9 @@
                         } else if (p == null && v.get("ps") != null) {
                             String value = JSON.parseObject(JSON.toJSONString(v.get("ps"))).get("value") + "";
                             p = pMap.get(pMap.keySet().iterator().next());
-                            if (value.equals("鏈�缁堝��")) {
+                            if (value.contains("鏈�缁堝��")) {
                                 textRenderData.setText(p.getLastValue());
-                            } else if (value.equals("缁撹")) {
+                            } else if (value.contains("缁撹")) {
                                 switch (p.getInsResult()) {
                                     case 1:
                                         textRenderData.setText("鉁�");
@@ -790,11 +798,11 @@
                                         textRenderData.setText("-");
                                         break;
                                 }
-                            } else if (value.equals("鏍峰搧缂栧彿")) {
+                            } else if (value.contains("鏍峰搧缂栧彿")) {
                                 textRenderData.setText(a.getSampleCode());
-                            } else if (value.equals("鏍峰搧鍨嬪彿")) {
+                            } else if (value.contains("鏍峰搧鍨嬪彿")) {
                                 textRenderData.setText(a.getModel());
-                            } else if (value.equals("鏍峰搧鍚嶇О")) {
+                            } else if (value.contains("鏍峰搧鍚嶇О")) {
                                 textRenderData.setText(a.getSample());
                             } else {
                                 textRenderData.setText(v.get("v") == null ? "" : v.get("v") + "");
@@ -823,27 +831,22 @@
                     List<TableRenderData> tables1 = new ArrayList<>();
                     TableRenderData tableRenderData = new TableRenderData();
                     tableRenderData.setRows(new ArrayList<>());
-
                     double totalHeight = 0.0; // 鐢ㄤ簬璺熻釜褰撳墠琛ㄦ牸鐨勬�昏楂�
-                    double heightThreshold = 8000.0; // 闃堝�硷紝渚嬪40cm*28px*15twips
+                    double heightThreshold = 8000.0; // 闃堝�硷紝
                     List<RowRenderData> firstTwoRows = new ArrayList<>(); // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
-
-
                     // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
                     if (rows.size() >= 2) {
                         firstTwoRows.add(rows.get(0));
                         firstTwoRows.add(rows.get(1));
                     }
-
                     for (RowRenderData row : rows) {
                         double rowHeight = row.getRowStyle().getHeight(); // 鑾峰彇褰撳墠琛岀殑琛岄珮
                         totalHeight += rowHeight; // 鏇存柊鎬昏楂�
-
                         if (totalHeight >= heightThreshold) {
                             // 鍒涘缓鏂拌〃鏍煎苟澶嶅埗鍓嶄袱琛�
                             TableRenderData newTableRenderData = new TableRenderData();
                             newTableRenderData.setRows(new ArrayList<>(firstTwoRows));
-
+                            //璁剧疆鏍峰紡
                             TableStyle tableStyle = new TableStyle();
                             tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
                             tableStyle.setWidth("10000");
@@ -858,7 +861,6 @@
                             tableStyle.setBottomBorder(borderStyle);
                             tableRenderData.setTableStyle(tableStyle);
                             newTableRenderData.setTableStyle(tableStyle);
-
                             tables1.add(tableRenderData);
                             tableRenderData = newTableRenderData;
                             totalHeight = rowHeight;
@@ -866,6 +868,7 @@
                         tableRenderData.getRows().add(row);
                     }
                     if (!tableRenderData.getRows().isEmpty()) {
+                        //璁剧疆鏍峰紡
                         TableStyle tableStyle = new TableStyle();
                         tableStyle.setColWidths(new int[]{650, 1600, 2000, 750, 2800, 1100, 1100});
                         tableStyle.setWidth("10000");
@@ -881,7 +884,6 @@
                         tableRenderData.setTableStyle(tableStyle);
                         tables1.add(tableRenderData);
                     }
-
                     tables1.forEach(table -> {
                         Map<String, Object> tableMap = new HashMap<>();
                         tableMap.put("table", table);
@@ -890,6 +892,616 @@
                     });
                 });
             });
+            /*鍏夌氦鎺ュご鎹熻�楃殑鎶ュ憡鏍峰紡*/
+            //鏌ヨ璁㈠崟涓嬫墍鏈夋牱鍝佺殑妫�楠岄」鐩�,濡傛灉鏈夊厜绾ゆ帴澶存崯鑰楀垯閲嶆柊鏋勫缓琛ㄦ牸
+            List<Map<String, Object>> tables4 = new ArrayList<>();
+            List<InsProduct> insProducts0 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getState, 1)
+                    .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+            if (insProducts0.stream().map(InsProduct::getInspectionItem).collect(Collectors.toList()).contains("鍏夌氦鎺ュご鎹熻��")) {
+                //娓呯┖鍘熸湁鐨勫熀纭�琛ㄦ牸
+                tables.clear();
+                //鍘婚噸鐨勬楠岄」鐩�
+                List<String> filteredProducts = insProducts0.stream().map(insProduct -> {
+                    return (insProduct.getInspectionItem() + "," + insProduct.getInspectionItemEn() + "," + insProduct.getInspectionItemSubclass() + "," + insProduct.getInspectionItemSubclassEn() + "," + insProduct.getTell());
+                }).distinct().collect(Collectors.toList());
+                //妫�楠岄」鐩殑鎬绘暟閲�(鍘婚噸)
+                long size = filteredProducts.size();
+                long number = 10;
+                long number2 = 7;
+                long index = 1;
+                //妫�楠岀粨鏋滄姤鍛�(褰撴楠岄」鐩秴杩�10涓柊寤鸿〃)
+                for (long i = 0; i < size; i++) {
+                    if (i % number == 0) {
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁�  鈭� 鉁� 鉁�
+                        for (int j = 0; j < number + 3; j++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁�
+                            for (int k = 0; k < 6; k++) {
+                                CellRenderData cellRenderData = new CellRenderData();
+                                CellStyle cellStyle = new CellStyle();
+                                cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                cellRenderData.setCellStyle(cellStyle);
+                                List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                List<RenderData> renderData = new ArrayList<>();
+                                TextRenderData textRenderData = new TextRenderData();
+                                Style style = new Style();
+                                style.setFontFamily("瀹嬩綋");
+                                style.setColor("000000");
+                                textRenderData.setStyle(style);
+                                if (j == 0) {
+                                    //绗竴琛�
+                                    if (k < 4) {
+                                        //鍓�4鍒�
+                                        textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�11");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //鍚�2鍒�
+                                        textRenderData.setText(insSamples.get(0).getModel() + "鈭�12");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+
+                                }
+                                else if (j == 1) {
+                                    //绗簩琛�
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText("搴忓彿@No.鈭�13");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 1) {
+                                        //绗簩鍒�
+                                        textRenderData.setText("妫�楠岄」鐩瓳Test Item鈭�14");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 2 || k == 3) {
+                                        //绗笁鍥涘垪
+                                        textRenderData.setText("鏍囧噯瑕佹眰@Requirement鈭�15");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (k == 4) {
+                                        //绗簲鍒�
+                                        textRenderData.setText("妫�楠岀粨鏋淍Test result鈭�16");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //绗叚鍒�
+                                        textRenderData.setText("缁撹@Conclusion鈭�17");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else if (j == number + 2) {
+                                    //鏈�鍚庝竴琛�
+                                    if (k == 0 || k == 1) {
+                                        //鍓嶄袱鍒�
+                                        textRenderData.setText("澶囨敞鈭�18");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        textRenderData.setText("鈥溾湐鈥濊〃绀洪」鐩悎鏍硷紝鈥溾湒鈥濊〃绀洪」鐩笉鍚堟牸@鈥溾湐鈥漣ndicates test Item is qualified锛屸�溾湒鈥漣ndicates test Item is unqualified鈭�19");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else {
+                                    if (k == 0) {
+                                        //绗竴鍒�
+                                        textRenderData.setText((j - 1) + "");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else if (k == 1) {
+                                        //绗簩鍒�
+                                        String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        String[] split = insProduct.split(",");
+                                        if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")) {
+                                            textRenderData.setText(split[0]);
+                                        } else {
+                                            textRenderData.setText(split[0] + "@" + split[1]);
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else if (k == 2) {
+                                        //绗笁鍒�
+                                        //鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
+                                        String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        String[] split = insProduct.split(",");
+                                        if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+                                            //濡傛灉娌℃湁瀛愮被
+                                            textRenderData.setText(split[4] + "鈭�2" + j);//瑕佹眰鎻忚堪
+                                        } else {
+                                            //濡傛灉鏈夊瓙绫�
+                                            //杩樿鍒ゆ柇鏄惁鏈夎嫳鏂�
+                                            if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")) {
+                                                textRenderData.setText(split[2]);//妫�楠屽瓙椤�
+                                            } else {
+                                                textRenderData.setText(split[2] + "@" + split[3]);//妫�楠屽瓙椤�+鑻辨枃
+                                            }
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else if (k == 3) {
+                                        //绗洓鍒�
+                                        //鍏堝垽鏂楠岄」鏄惁鏈夊瓙绫�
+                                        String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        String[] split = insProduct.split(",");
+                                        if (ObjectUtils.isEmpty(split[2]) || split[2].equals("")) {
+                                            //濡傛灉娌℃湁瀛愮被
+                                            textRenderData.setText(split[4] + "鈭�2" + j);//瑕佹眰鎻忚堪
+                                        } else {
+                                            //濡傛灉鏈夊瓙绫�
+                                            textRenderData.setText(split[4]);//瑕佹眰鎻忚堪
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else if (k == 4) {
+                                        //绗簲鍒�
+                                        String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        String[] split = insProduct.split(",");
+                                        //鏌ヨ鎵�鏈夋牱鍝佽妫�楠岄」鐨勬楠岀粨鏋�(鏈�缁堝��)
+                                        List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2])
+                                                .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+                                        //鑾峰彇鏈�灏忓�煎拰鏈�澶у��
+                                        Optional<String> max = products.stream().map(InsProduct::getLastValue)
+                                                .filter(value -> !value.isEmpty())
+                                                .max(String::compareTo);
+                                        Optional<String> min = products.stream().map(InsProduct::getLastValue)
+                                                .filter(value -> !value.isEmpty())
+                                                .min(String::compareTo);
+                                        textRenderData.setText(min+"-"+max);//妫�楠岀粨鏋�
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else {
+                                        //鏈�鍚庝竴鍒�
+                                        String insProduct = filteredProducts.get((int) ((j - 2) + 10 * (index - 1)));
+                                        String[] split = insProduct.split(",");
+                                        //鏌ヨ鎵�鏈夋牱鍝佽妫�楠岄」鐨勬楠岀粨璁�(ins_result)
+                                        List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2])
+                                                .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
+                                        List<Integer> result = products.stream().map(InsProduct::getInsResult).distinct().collect(Collectors.toList());
+                                        if (result.size() == 1 && result.contains(1)) {
+                                            //鍚堟牸
+                                            textRenderData.setText("鉁�");
+                                        }else {
+                                            //涓嶅悎鏍�
+                                            textRenderData.setText("鉁�");
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                            }
+                            rowRenderData.setCells(cells);
+                            if (rowRenderData.getCells().size() != 0) {
+                                rows.add(rowRenderData);
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        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("姣忚鍗曞厓鏍间笉鐩哥瓑");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index", index);
+                        tables.add(table);
+                        index++;
+                    }
+                }
+                long index4 = 1;
+                //妫�楠屾姤鍛婃姤鍛�(褰撴楠岄」鐩秴杩�7涓柊寤鸿〃)
+                for (long j = 0; j < size; j++) {
+                    if (j%number2==0){
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁�(鏍规嵁鏍峰搧鏁伴噺鏉�)
+                        for (int i = 0; i < samples.size() + 2; i++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁�
+                            for (int k = 0; k < 8; k++) {
+                                CellRenderData cellRenderData = new CellRenderData();
+                                CellStyle cellStyle = new CellStyle();
+                                cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                cellRenderData.setCellStyle(cellStyle);
+                                List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                List<RenderData> renderData = new ArrayList<>();
+                                TextRenderData textRenderData = new TextRenderData();
+                                Style style = new Style();
+                                style.setFontFamily("瀹嬩綋");
+                                style.setColor("000000");
+                                textRenderData.setStyle(style);
+                                if (i==0){
+                                    //绗竴琛�
+                                    if (k==0){
+                                        //绗竴鍒�
+                                        textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else {
+                                        //绗簩鍒�
+                                        String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+                                        String[] split = product.split(",");
+                                        if (ObjectUtils.isEmpty(split[2])||split[2].equals("")){
+                                            if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")){
+                                                textRenderData.setText(split[0]+"鈭�3"+k);
+                                            }else {
+                                                textRenderData.setText(split[0]+"@"+split[1]+"鈭�3"+k);
+                                            }
+                                        }else {
+                                            if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")){
+                                                textRenderData.setText(split[0]);
+                                            }else {
+                                                textRenderData.setText(split[0]+"@"+split[1]);
+                                            }
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else if (i==1){
+                                    //绗簩琛�
+                                    if (k==0){
+                                        //绗竴鍒�
+                                        textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�30");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else {
+                                        //绗簩鍒�
+                                        String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+                                        String[] split = product.split(",");
+                                        if (ObjectUtils.isEmpty(split[2])||split[2].equals("")){
+                                            if (ObjectUtils.isEmpty(split[1]) || split[1].equals("")){
+                                                textRenderData.setText(split[0]+"鈭�3"+k);
+                                            }else {
+                                                textRenderData.setText(split[0]+"@"+split[1]+"鈭�3"+k);
+                                            }
+                                        }else {
+                                            if (ObjectUtils.isEmpty(split[3]) || split[3].equals("")){
+                                                textRenderData.setText(split[2]);
+                                            }else {
+                                                textRenderData.setText(split[2]+"@"+split[3]);
+                                            }
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else {
+                                    if (k==0){
+                                        //绗竴鍒�
+                                        textRenderData.setText(samples.get(i-2).getSampleCode());
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else {
+                                        //鏍规嵁鏍峰搧缂栧彿鍜岄」鐩幓鏌ヨ鏈�缁堝��
+                                        String product = filteredProducts.get((int) ((k - 1) + (index4 - 1) * 7));
+                                        String[] split = product.split(",");
+                                        InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInsSampleId, samples.get(i - 2).getId())
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2]));
+                                        if (ObjectUtils.isEmpty(insProduct)){
+                                            //鍙兘鏍规嵁姝ｅ父鐨勬牱鍝佺紪鍙峰拰鍏夌氦鎺ュご鎹熻�楃殑椤圭洰鏌ヤ笉鍒板搴旂殑椤圭洰,鍒欓渶瑕佹牴鎹�"/"鏉ユ煡
+                                            List<InsSample> sampleList = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().like(InsSample::getSampleCode, samples.get(i - 2).getSampleCode()));
+                                            List<InsProduct> products = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getState, 1)
+                                                    .in(InsProduct::getInsSampleId, sampleList.stream().map(InsSample::getId).collect(Collectors.toList()))
+                                                    .eq(InsProduct::getInspectionItem, split[0])
+                                                    .eq(InsProduct::getInspectionItemSubclass, split[2]));
+                                            insProduct=products.get(0);
+                                        }
+                                        textRenderData.setText(insProduct.getLastValue());
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+
+                            }
+                            rowRenderData.setCells(cells);
+                            if (rowRenderData.getCells().size() != 0) {
+                                rows.add(rowRenderData);
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        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("姣忚鍗曞厓鏍间笉鐩哥瓑");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table4", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index4", index4);
+                        tables4.add(table);
+                        index4++;
+                    }
+                }
+                //鍏夌氦鎺ュご鎹熻�楃殑鎶ュ憡杩樻槸tables4
+                //鏌ヨ鏍峰搧(鍙煡璇㈠甫"/")鐨勬暟閲�
+                List<InsSample> sampleList = insSamples.stream().filter(insSample -> insSample.getSampleCode().contains("/")).collect(Collectors.toList());
+                //杩囨护鍑哄厜绾ゆ帴澶存崯鑰楃殑妫�楠岄」鐩�
+                List<String> strings = filteredProducts.stream().filter(s -> s.contains("鍏夌氦鎺ュご鎹熻��")).distinct().collect(Collectors.toList());
+                for (int i = 0; i < sampleList.size(); i++) {
+                    if (i%16==0){
+                        //鏍峰搧鏁伴噺瓒呰繃16闇�瑕佹柊澧炶〃鏍�
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁�
+                        for (int j = 0; j < 17; j++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁�
+                            for (int k = 0; k < 6; k++) {
+                                CellRenderData cellRenderData = new CellRenderData();
+                                CellStyle cellStyle = new CellStyle();
+                                cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                cellRenderData.setCellStyle(cellStyle);
+                                List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                List<RenderData> renderData = new ArrayList<>();
+                                TextRenderData textRenderData = new TextRenderData();
+                                Style style = new Style();
+                                style.setFontFamily("瀹嬩綋");
+                                style.setColor("000000");
+                                textRenderData.setStyle(style);
+                                if (j==0){
+                                    //绗竴琛�
+                                    if (k==0){
+                                        //绗竴鍒�
+                                        textRenderData.setText("鍏夌氦绫诲瀷@Fiber type");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }else if (k==1 || k==2){
+                                        //绗簩 涓夊垪
+                                        textRenderData.setText("鏍峰搧缂栧彿@Sample number");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }else {
+                                        String[] split = strings.get(k - 3).split(",");
+                                        if (ObjectUtils.isEmpty(split[3])|| split[3].equals("")){
+                                            textRenderData.setText(split[2]);
+                                        }else {
+                                            textRenderData.setText(split[2]+"@"+split[3]);
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                                else {
+                                    if (k==0){
+                                        //绗竴鍒�
+                                        textRenderData.setText(sampleList.get(0).getSampleCode()+"鈭�44");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else if (k==1){
+                                        //绗簩鍒�
+                                        textRenderData.setText(sampleList.get(j-1).getSampleCode().split("/")[0]);
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else if (k==2){
+                                        //绗笁鍒�
+                                        textRenderData.setText(sampleList.get(j-1).getSampleCode().split("/")[1]);
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                    else {
+                                        //鏍规嵁瀵瑰簲鐨勬牱鍝佺紪鍙峰拰妫�楠岄」鐩煡璇㈠搴旀暟鎹�(鏈�缁堝��)
+                                        String[] split = strings.get(k - 3).split(",");
+                                        InsProduct insProduct = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
+                                                .eq(InsProduct::getState, 1)
+                                                .eq(InsProduct::getInsSampleId, sampleList.get(j - 1).getId())
+                                                .eq(InsProduct::getInspectionItem, split[0])
+                                                .eq(InsProduct::getInspectionItemSubclass, split[2]));
+                                        textRenderData.setText(insProduct.getLastValue());
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    }
+                                }
+                            }
+                            rowRenderData.setCells(cells);
+                            if (rowRenderData.getCells().size() != 0) {
+                                rows.add(rowRenderData);
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        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("姣忚鍗曞厓鏍间笉鐩哥瓑");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table4", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index4", index4+1);
+                        tables4.add(table);
+                        index4++;
+                    }
+                }
+                tables4.forEach(table4 -> {
+                    table4.put("tableSize4", tables4.size());
+                });
+
+            }
             String url;
             try {
                 InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
@@ -953,12 +1565,17 @@
                 resultCh.set("渚濇嵁濮旀墭瑕佹眰锛屾墍妫�椤圭洰鍧囩鍚堣姹傘��");
                 resultEn.set("According to commissioned requirements, all the tested items meet the requirements.");
             }
-            /*鍏夌氦鐨勬楠屾姤鍛�*/
+
+
+            /*鍏夌氦閰嶇疆鐨勬楠屾姤鍛�*/
             //鍏堝垽鏂槸鍚︽湁鍏夌氦閰嶇疆
-            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList())));
-            List<Integer> collect = insProducts.stream().map(InsProduct::getInsFiberId).filter(str -> str != null).collect(Collectors.toList());
+            List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getState, 1)
+                    .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList()))
+                    .isNotNull(InsProduct::getInsFiberId)
+                    .isNull(InsProduct::getInspectionItemClass));//鐢ㄦ楠屽垎椤瑰瓧娈靛尯鍒厜绾ら厤缃笌娓╁害寰幆
             List<Map<String, Object>> tables2 = new ArrayList<>();
-            if (collect.size() > 0) {
+            if (insProducts.size() > 0) {
                 samples.forEach(sample -> {
                     List<InsProduct> insProducts1 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                             .eq(InsProduct::getState, 1)
@@ -977,6 +1594,7 @@
                     long size2 = insProducts1.stream().map(InsProduct::getInsFiberId).distinct().count();
                     long number = 7;
                     long k = 0;
+                    long index2 = 1;
                     for (long c = 0; c < size; c++) {
                         if (c % number == 0) {
                             List<RowRenderData> rows = new ArrayList<>();
@@ -1020,7 +1638,7 @@
                                         //绗竴琛�
                                         if (j == 0) {
                                             //绗竴鍒�
-                                            textRenderData.setText("绠¤壊鏍�&Pipe鈭�100");
+                                            textRenderData.setText("绠¤壊鏍嘆Pipe鈭�100");
                                             renderData.add(textRenderData);
                                             paragraphRenderData.setContents(renderData);
                                             paragraphRenderDataList.add(paragraphRenderData);
@@ -1028,7 +1646,7 @@
                                             cells.add(cellRenderData);
                                         } else if (j == 1) {
                                             //绗簩鍒�
-                                            textRenderData.setText("鍏夌氦鑹叉爣&Scanning Number鈭�101");
+                                            textRenderData.setText("鍏夌氦鑹叉爣@Scanning Number鈭�101");
                                             renderData.add(textRenderData);
                                             paragraphRenderData.setContents(renderData);
                                             paragraphRenderDataList.add(paragraphRenderData);
@@ -1041,7 +1659,7 @@
                                             } catch (Exception e) {
                                                 continue;
                                             }
-                                            textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "&" + insProducts1.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+                                            textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "@" + insProducts1.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
                                             renderData.add(textRenderData);
                                             paragraphRenderData.setContents(renderData);
                                             paragraphRenderDataList.add(paragraphRenderData);
@@ -1052,7 +1670,7 @@
                                         //鏈夌埗瀛愰」鐩叧绯荤殑绗笁琛�
                                         if (j == 0) {
                                             //绗竴鍒�
-                                            textRenderData.setText("绠¤壊鏍�&Pipe鈭�100");
+                                            textRenderData.setText("绠¤壊鏍嘆Pipe鈭�100");
                                             renderData.add(textRenderData);
                                             paragraphRenderData.setContents(renderData);
                                             paragraphRenderDataList.add(paragraphRenderData);
@@ -1060,7 +1678,7 @@
                                             cells.add(cellRenderData);
                                         } else if (j == 1) {
                                             //绗簩鍒�
-                                            textRenderData.setText("鍏夌氦鑹叉爣&Scanning Number鈭�101");
+                                            textRenderData.setText("鍏夌氦鑹叉爣@Scanning Number鈭�101");
                                             renderData.add(textRenderData);
                                             paragraphRenderData.setContents(renderData);
                                             paragraphRenderDataList.add(paragraphRenderData);
@@ -1075,9 +1693,9 @@
                                             }
                                             //鍒ゆ柇鏄惁鏈夐」鐩瓙绫�
                                             if (filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass().equals("") || filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() == null) {
-                                                textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "&" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
+                                                textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItem() + "@" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemEn() + "鈭�" + (j + 101 + k));
                                             } else {
-                                                textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() + "&" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclassEn());
+                                                textRenderData.setText(filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclass() + "@" + filteredProducts.get((int) (j - 2 + k)).getInspectionItemSubclassEn());
                                             }
                                             renderData.add(textRenderData);
                                             paragraphRenderData.setContents(renderData);
@@ -1139,10 +1757,10 @@
                             tableRenderData.setRows(rows);
                             int countSize = tableRenderData.getRows().get(0).getCells().size();
                             for (RowRenderData row : tableRenderData.getRows()) {
-                                for (CellRenderData cell : row.getCells()) {
+                                /*for (CellRenderData cell : row.getCells()) {
                                     System.out.print(cell.getParagraphs().get(0).getContents());
                                 }
-                                System.out.println("");
+                                System.out.println("");*/
                                 if (row.getCells().size() != countSize) {
                                     throw new ErrorException("姣忚鍗曞厓鏍间笉鐩哥瓑");
                                 }
@@ -1164,12 +1782,1295 @@
                             table.put("report", insReport);
                             table.put("sample_number", sample.getSampleCode());
                             table.put("type", sample.getModel());
+                            table.put("index2", index2);
                             tables2.add(table);
                             k += 7;
+                            index2++;
                         }
                     }
                 });
             }
+            tables2.forEach(table2 -> {
+                table2.put("tableSize2", tables2.size());
+            });
+
+            /*娓╁害寰幆鐨勬楠屾姤鍛�*/
+            //鍏堝垽鏂槸鍚︽湁娓╁害寰幆
+            List<InsProduct> insProducts3 = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                    .eq(InsProduct::getState, 1)
+                    .in(InsProduct::getInsSampleId, insSamples.stream().map(InsSample::getId).distinct().collect(Collectors.toList()))
+                    .isNotNull(InsProduct::getInspectionItemClass)//鐢ㄦ楠屽垎椤瑰瓧娈靛尯鍒厜绾ら厤缃笌娓╁害寰幆
+                    .isNotNull(InsProduct::getInsFiberId));
+            List<Map<String, Object>> tables3 = new ArrayList<>();
+            if (insProducts3.size() > 0) {
+                samples.forEach(sample -> {
+                    //鏌ヨ娓╁害寰幆涓嬬殑妫�楠岄」鐩�
+                    List<InsProduct> insPros = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                            .eq(InsProduct::getState, 1)
+                            .eq(InsProduct::getInsSampleId, sample.getId())
+                            .isNotNull(InsProduct::getInsFiberId)
+                            .isNotNull(InsProduct::getInspectionItemClass));
+
+                    //鑾峰彇鎵�鏈夋楠岄」鐩�,鎸夌収寰幆娆℃暟,鑹叉爣,娓╁害,nm杩涜鎺掑簭
+                    Map<String, Integer> temperatureToIdMap = new HashMap<>();
+                    for (InsProduct product : insPros) {
+                        String temperature = product.getInspectionItemSubclass();
+                        int id = product.getId();
+                        temperatureToIdMap.putIfAbsent(temperature, id);
+                        if (temperatureToIdMap.get(temperature) > id) {
+                            temperatureToIdMap.put(temperature, id);
+                        }
+                    }
+
+                    // 鑷畾涔夋帓搴�
+                    Collections.sort(insPros, new Comparator<InsProduct>() {
+                        @Override
+                        public int compare(InsProduct p1, InsProduct p2) {
+                            // 棣栧厛鎸塯etInspectionItem鎺掑簭
+                            int result = p1.getInspectionItem().compareTo(p2.getInspectionItem());
+                            if (result != 0) {
+                                return result;
+                            }
+                            // 濡傛灉getInspectionItem鐩哥瓑锛屽啀鎸塯etInsFiberId鎺掑簭
+                            result = p1.getInsFiberId().compareTo(p2.getInsFiberId());
+                            if (result != 0) {
+                                return result;
+                            }
+                            // 濡傛灉getInsFiberId涔熺浉绛夛紝鏈�鍚庢寜getInspectionItemSubclass鎺掑簭
+                            return compareTemperature(p1.getInspectionItemSubclass(), p2.getInspectionItemSubclass());
+                        }
+
+                        private int compareTemperature(String temp1, String temp2) {
+                            // 鏍规嵁娓╁害瀵瑰簲鐨刬d杩涜鎺掑簭
+                            int id1 = temperatureToIdMap.get(temp1);
+                            int id2 = temperatureToIdMap.get(temp2);
+
+                            return Integer.compare(id1, id2);
+                        }
+                    });
+                    List<InsProduct> filteredProducts = insPros;
+                    //鑾峰彇鎵�鏈夊厜绾よ壊鏍�
+                    List<InsFiber> insFibers = insFiberMapper.selectBatchIds(insPros.stream().map(InsProduct::getInsFiberId).collect(Collectors.toList()));
+                    //鑾峰彇鎵�鏈夌殑娓╁害(闄や簡绗竴涓�20鈩�(甯告俯))
+                    List<String> temperature = insPros.stream().map(InsProduct::getInspectionItemSubclass).filter(s -> !s.equals("20鈩�(甯告俯)")).distinct().collect(Collectors.toList());
+                    //鑾峰彇鎵�鏈夌殑娓╁害(闄や簡绗竴涓�20鈩�(甯告俯)鍜屾渶鍚庝竴涓�20鈩�)
+                    List<String> temperature2 = insPros.stream().map(InsProduct::getInspectionItemSubclass).filter(s -> !s.equals("20鈩�(甯告俯)")).filter(s -> !s.equals("20鈩�")).distinct().collect(Collectors.toList());
+                    //鑾峰彇鎵�鏈夌殑鍏夌氦椤圭洰(1310nm)
+                    List<String> nm = insPros.stream().map(InsProduct::getInspectionItemClass).distinct().collect(Collectors.toList());
+                    //鑾峰彇鎵�鏈夋楠岄」鐩殑鏁伴噺(鍒楁暟)(杩欓噷闇�瑕佹敞鎰忎袱涓俯搴�,涓�涓槸20鈩冨父娓�(鍙湁绗竴娆″惊鐜墠鏈�),鍙︿竴涓槸20鈩�(鍙湁鏈�鍚庝竴涓惊鐜墠鏈�))
+                    long size = insPros.stream().map(insProduct -> {
+                        return (insProduct.getInspectionItemSubclass() + insProduct.getInspectionItemClass());
+                    }).distinct().collect(Collectors.toList()).size();
+                    //鑾峰彇寰幆娆℃暟(琛ㄦ牸鐨勬暟閲�)
+                    int size1 = insPros.stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.toList()).size();
+                    //鑾峰彇鍏夌氦鑹叉爣鐨勬暟閲�(琛屾暟)
+                    long size2 = insPros.stream().map(InsProduct::getInsFiberId).distinct().count();
+                    long index3 = 1;
+                    for (int i = 0; i < size1; i++) {
+                        //鎸夌収寰幆娆℃暟鐢熸垚瀵瑰簲鏁伴噺鐨勮〃鏍�
+                        List<RowRenderData> rows = new ArrayList<>();
+                        //琛ㄦ牸鐨勮鏁�(鍏夌氦鑹叉爣鐨勬暟閲�+8)
+                        for (long j = 0; j < size2 + 8; j++) {
+                            RowRenderData rowRenderData = new RowRenderData();
+                            RowStyle rowStyle = new RowStyle();
+                            rowStyle.setHeight(40);
+                            rowRenderData.setRowStyle(rowStyle);
+                            List<CellRenderData> cells = new ArrayList<>();
+                            //琛ㄦ牸鐨勫垪鏁伴渶瑕佹牴鎹惊鐜殑娆℃暟瀵瑰簲鐨勬敼鍙�
+                            if (size1 == 1) {
+                                //濡傛灉鍙惊鐜竴娆�,閭ｄ箞鍒楁暟鍖呮嫭20鈩冨拰20鈩冨父娓�(2 * size - nm.size()+1)
+                                for (long k = 0; k < 2 * size - nm.size() + 1; k++) {
+                                    CellRenderData cellRenderData = new CellRenderData();
+                                    CellStyle cellStyle = new CellStyle();
+                                    cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                    cellRenderData.setCellStyle(cellStyle);
+                                    List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                    ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                    ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                    paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                    paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                    List<RenderData> renderData = new ArrayList<>();
+                                    TextRenderData textRenderData = new TextRenderData();
+                                    Style style = new Style();
+                                    style.setFontFamily("瀹嬩綋");
+                                    style.setColor("000000");
+                                    textRenderData.setStyle(style);
+                                    if (j == 0) {
+                                        //绗竴琛�
+                                        if (k <= (2 * size - nm.size() + 1) / 4) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                        } else if (k > (2 * size - nm.size() + 1) / 4 && k <= (2 * size - nm.size() + 1) / 2) {
+                                            //绗簩鍒�
+                                            textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                        } else if (k > (2 * size - nm.size() + 1) / 2 && k < 2 * size - nm.size()) {
+                                            //绗笁鍒�
+                                            textRenderData.setText("瑙勬牸鍨嬪彿@Type 鈭�999");
+                                        } else {
+                                            //绗洓鍒�
+                                            textRenderData.setText(sample.getModel());
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (j == 1) {
+                                        //绗簩琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                        } else {
+                                            textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                        }
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else if (j == 2) {
+                                        //绗笁琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > 0 && k <= nm.size()) {
+                                            //绗簩鍒�
+                                            textRenderData.setText("20鈩�(甯告俯)鈭�1006");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鏍规嵁娓╁害寰幆
+                                            for (int i1 = 0; i1 < temperature.size(); i1++) {
+                                                if (k > (2 * i1 + 1) * nm.size() && k <= (2 * i1 + 3) * nm.size()) {
+                                                    //绗笁鍒�
+                                                    textRenderData.setText(temperature.get(i1) + "鈭�52" + i1);
+                                                    renderData.add(textRenderData);
+                                                    paragraphRenderData.setContents(renderData);
+                                                    paragraphRenderDataList.add(paragraphRenderData);
+                                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                    cells.add(cellRenderData);
+                                                }
+                                            }
+                                        }
+                                    } else if (j == 3) {
+                                        //绗洓琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > 0 && k <= nm.size()) {
+                                            //绗簩鍒楀拰绗笁鍒�
+                                            for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                if (k == i1 + 1) {
+                                                    textRenderData.setText(nm.get(i1));
+                                                    renderData.add(textRenderData);
+                                                    paragraphRenderData.setContents(renderData);
+                                                    paragraphRenderDataList.add(paragraphRenderData);
+                                                    cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                    cells.add(cellRenderData);
+                                                }
+                                            }
+                                        } else {
+                                            for (int j1 = 0; j1 < temperature.size(); j1++) {
+                                                for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                    if (k > (i1 + 1 + 2 * j1) * nm.size() && k <= (i1 + 1 + 2 * j1) * nm.size() + 2) {
+                                                        textRenderData.setText(nm.get(i1));
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    } else if (j == 4) {
+                                        //绗簲琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > 0 && k <= nm.size()) {
+                                            //绗簩鍒楀拰绗笁鍒�
+                                            textRenderData.setText("琛板噺");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k > nm.size() && (k - (nm.size())) % 2 == 0) {
+                                            textRenderData.setText("|鈭� 伪|");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            textRenderData.setText("琛板噺");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (j == size2 + 5) {
+                                        //鍊掓暟绗笁琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("|max|");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k <= nm.size()) {
+                                            //璁＄畻20鈩冨父娓╃殑绗�(k-1)涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                            List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) (k - 1)))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                            List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                            Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                            }).filter(value -> !value.isEmpty())
+                                                    .max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if ((k - (nm.size())) % 2 == 0) {
+                                            //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                            Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                    .stream().map(InsProduct::getLastValue)
+                                                    .filter(value -> !value.isEmpty())
+                                                    .max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                            List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (((k + 1) / (nm.size() + 2)) - 1)))
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - (nm.size() + 2)) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                            List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                            Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                            }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (j == size2 + 6) {
+                                        //鍊掓暟绗簩琛�
+                                        if (k == 0) {
+                                            //绗竴鍒�
+                                            textRenderData.setText("|鈭� 伪 max|");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k <= nm.size()) {
+                                            textRenderData.setText("-");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if ((k - (nm.size())) % 2 == 0) {
+                                            Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                    .eq(InsProduct::getInsSampleId, sample.getId())
+                                                    .isNotNull(InsProduct::getInsFiberId)
+                                                    .eq(InsProduct::getInspectionItem, i + 1)
+                                                    .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                    .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                    .stream().map(InsProduct::getLastValue)
+                                                    .filter(value -> !value.isEmpty())
+                                                    .max(String::compareTo);
+                                            if (max.isPresent()) {
+                                                textRenderData.setText(max.get());
+                                            } else {
+                                                textRenderData.setText("");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            textRenderData.setText("-");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    } else if (j == size2 + 7) {
+                                        //鍊掓暟绗竴琛�
+                                        textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                        renderData.add(textRenderData);
+                                        paragraphRenderData.setContents(renderData);
+                                        paragraphRenderDataList.add(paragraphRenderData);
+                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                        cells.add(cellRenderData);
+                                    } else {
+                                        //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                        if (k == 0) {
+                                            //绗竴鍒楀～鍐欒壊鏍�
+                                            textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (k <= nm.size()) {
+                                            //绗簩鍒楀拰绗笁鍒楀～鍐�20鈩冨父娓╃殑骞冲潎鍊�(result琛ㄩ噷闈㈢殑com_value)
+                                            textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + k - 1)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if ((k - (nm.size())) % 2 == 0) {
+                                            //濉啓琛板噺宸氨鏄痩ast_value
+                                            textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + k / 2)).getLastValue());
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //濉啓鍏朵綑姝ｅ父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                            textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + (k + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        }
+                                    }
+                                }
+                                rowRenderData.setCells(cells);
+                                if (rowRenderData.getCells().size() != 0) {
+                                    rows.add(rowRenderData);
+                                }
+                            }
+                            else {
+                                //濡傛灉鏈夊娆″惊鐜�
+                                if (i == 0) {
+                                    //绗竴娆″惊鐜殑鍒楁暟,閭ｄ箞鍒楁暟鍖呮嫭20鈩冨父娓�(2 * (size-nm.size()) -nm.size()+1)
+                                    for (long k = 0; k < 2 * (size - nm.size()) - nm.size() + 1; k++) {
+                                        CellRenderData cellRenderData = new CellRenderData();
+                                        CellStyle cellStyle = new CellStyle();
+                                        cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                        cellRenderData.setCellStyle(cellStyle);
+                                        List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                        ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                        List<RenderData> renderData = new ArrayList<>();
+                                        TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
+                                        if (j == 0) {
+                                            //绗竴琛�
+                                            if (k <= (2 * (size - nm.size()) - nm.size() + 1) / 4) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                            } else if (k > (2 * (size - nm.size()) - nm.size() + 1) / 4 && k <= (2 * (size - nm.size()) - nm.size() + 1) / 2) {
+                                                //绗簩鍒�
+                                                textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                            } else if (k > (2 * (size - nm.size()) - nm.size() + 1) / 2 && k < 2 * (size - nm.size()) - nm.size()) {
+                                                //绗笁鍒�
+                                                textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
+                                            } else {
+                                                //绗洓鍒�
+                                                textRenderData.setText(sample.getModel());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            } else {
+                                                textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 2) {
+                                            //绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > 0 && k <= nm.size()) {
+                                                //绗簩鍒�
+                                                textRenderData.setText("20鈩�(甯告俯)鈭�1006");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //鏍规嵁娓╁害寰幆
+                                                for (int i1 = 0; i1 < temperature2.size(); i1++) {
+                                                    if (k > (2 * i1 + 1) * nm.size() && k <= (2 * i1 + 3) * nm.size()) {
+                                                        //绗笁鍒�
+                                                        textRenderData.setText(temperature2.get(i1) + "鈭�52" + i1);
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 3) {
+                                            //绗洓琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > 0 && k <= nm.size()) {
+                                                //绗簩鍒楀拰绗笁鍒�
+                                                for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                    if (k == i1 + 1) {
+                                                        textRenderData.setText(nm.get(i1));
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            } else {
+                                                for (int j1 = 0; j1 < temperature2.size(); j1++) {
+                                                    for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                        if (k > (i1 + 1 + 2 * j1) * nm.size() && k <= (i1 + 1 + 2 * j1) * nm.size() + 2) {
+                                                            textRenderData.setText(nm.get(i1));
+                                                            renderData.add(textRenderData);
+                                                            paragraphRenderData.setContents(renderData);
+                                                            paragraphRenderDataList.add(paragraphRenderData);
+                                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                            cells.add(cellRenderData);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 4) {
+                                            //绗簲琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > 0 && k <= nm.size()) {
+                                                //绗簩鍒楀拰绗笁鍒�
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k > nm.size() && (k - (nm.size())) % 2 == 0) {
+                                                textRenderData.setText("|鈭� 伪|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 5) {
+                                            //鍊掓暟绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k <= nm.size()) {
+                                                //璁＄畻20鈩冨父娓╃殑绗�(k-1)涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (k - 1)))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if ((k - (nm.size())) % 2 == 0) {
+                                                //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (((k + 1) / (nm.size() + 2)) - 1)))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - (nm.size() + 2)) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 6) {
+                                            //鍊掓暟绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|鈭� 伪 max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k <= nm.size()) {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if ((k - (nm.size())) % 2 == 0) {
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k / (nm.size() + 2)) - 1)))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - (nm.size() + 2)) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 7) {
+                                            //鍊掓暟绗竴琛�
+                                            textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                            if (k == 0) {
+                                                //绗竴鍒楀～鍐欒壊鏍�
+                                                textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k <= nm.size()) {
+                                                //绗簩鍒楀拰绗笁鍒楀～鍐�20鈩冨父娓╃殑骞冲潎鍊�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() + 1) * nm.size() + k - 1)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if ((k - (nm.size())) % 2 == 0) {
+                                                //濉啓琛板噺宸氨鏄痩ast_value
+                                                textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + k / 2)).getLastValue());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //濉啓鍏朵綑姝ｅ父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + (k + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        }
+                                    }
+                                } else if (i == size1 - 1) {
+                                    //鏈�鍚庝竴娆″惊鐜殑鍒楁暟,閭ｄ箞鍒楁暟鍖呮嫭20鈩�(2 * (size-nm.size())+1)
+                                    for (long k = 0; k < 2 * (size - nm.size()) + 1; k++) {
+                                        CellRenderData cellRenderData = new CellRenderData();
+                                        CellStyle cellStyle = new CellStyle();
+                                        cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                        cellRenderData.setCellStyle(cellStyle);
+                                        List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                        ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                        List<RenderData> renderData = new ArrayList<>();
+                                        TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
+                                        if (j == 0) {
+                                            //绗竴琛�
+                                            if (k <= (2 * (size - nm.size()) + 1) / 4) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                            } else if (k > (2 * (size - nm.size()) + 1) / 4 && k <= (2 * (size - nm.size()) + 1) / 2) {
+                                                //绗簩鍒�
+                                                textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                            } else if (k > (2 * (size - nm.size()) + 1) / 2 && k < 2 * (size - nm.size())) {
+                                                //绗笁鍒�
+                                                textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
+                                            } else {
+                                                //绗洓鍒�
+                                                textRenderData.setText(sample.getModel());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            } else {
+                                                textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 2) {
+                                            //绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //鏍规嵁娓╁害寰幆
+                                                for (int i1 = 0; i1 < temperature.size(); i1++) {
+                                                    if (k > (2 * i1) * nm.size() && k <= (2 * i1 + 2) * nm.size()) {
+                                                        //绗笁鍒�
+                                                        textRenderData.setText(temperature.get(i1) + "鈭�52" + i1);
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 3) {
+                                            //绗洓琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                for (int j1 = 0; j1 < temperature.size(); j1++) {
+                                                    for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                        if (k > (i1 + 2 * j1) * nm.size() && k <= (i1 + 2 * j1) * nm.size() + 2) {
+                                                            textRenderData.setText(nm.get(i1));
+                                                            renderData.add(textRenderData);
+                                                            paragraphRenderData.setContents(renderData);
+                                                            paragraphRenderDataList.add(paragraphRenderData);
+                                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                            cells.add(cellRenderData);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 4) {
+                                            //绗簲琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                textRenderData.setText("|鈭� 伪|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 5) {
+                                            //鍊掓暟绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k - 1) / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (k / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - nm.size()) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 6) {
+                                            //鍊掓暟绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|鈭� 伪 max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k - 1) / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 7) {
+                                            //鍊掓暟绗竴琛�
+                                            textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                            if (k == 0) {
+                                                //绗竴鍒楀～鍐欒壊鏍�
+                                                textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //濉啓琛板噺宸氨鏄痩ast_value
+                                                textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + ((temperature.size() * nm.size() * size2 * i) - (size2 * nm.size() * (i - 1))) + (k - 2) / 2)).getLastValue());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //濉啓鍏朵綑姝ｅ父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size()) * nm.size() + ((temperature.size() * nm.size() * size2 * i) - (size2 * nm.size() * (i - 1))) + ((k - 2) + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        }
+                                    }
+                                } else {
+                                    //鍏朵綑寰幆鐨勫垪鏁�,,閭ｄ箞鍒楁暟涓嶅寘鎷�20鈩�+20鈩�(甯告俯)(2 * (size- 2*nm.size()) +1)
+                                    for (long k = 0; k < 2 * (size - 2 * nm.size()) + 1; k++) {
+                                        CellRenderData cellRenderData = new CellRenderData();
+                                        CellStyle cellStyle = new CellStyle();
+                                        cellStyle.setVertAlign(XWPFTableCell.XWPFVertAlign.CENTER);
+                                        cellRenderData.setCellStyle(cellStyle);
+                                        List<ParagraphRenderData> paragraphRenderDataList = new ArrayList<>();
+                                        ParagraphRenderData paragraphRenderData = new ParagraphRenderData();
+                                        ParagraphStyle paragraphStyle = new ParagraphStyle();
+                                        paragraphStyle.setAlign(ParagraphAlignment.CENTER);
+                                        paragraphRenderData.setParagraphStyle(paragraphStyle);
+                                        List<RenderData> renderData = new ArrayList<>();
+                                        TextRenderData textRenderData = new TextRenderData();
+                                        Style style = new Style();
+                                        style.setFontFamily("瀹嬩綋");
+                                        style.setColor("000000");
+                                        textRenderData.setStyle(style);
+                                        if (j == 0) {
+                                            //绗竴琛�
+                                            if (k <= (2 * (size - 2 * nm.size()) + 1) / 4) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鏍峰搧缂栧彿@Sample number鈭�1000");
+                                            } else if (k > (2 * (size - 2 * nm.size()) + 1) / 4 && k <= (2 * (size - 2 * nm.size()) + 1) / 2) {
+                                                //绗簩鍒�
+                                                textRenderData.setText(sample.getSampleCode() + "鈭�998");
+                                            } else if (k > (2 * (size - 2 * nm.size()) + 1) / 2 && k < 2 * (size - 2 * nm.size())) {
+                                                //绗笁鍒�
+                                                textRenderData.setText("瑙勬牸鍨嬪彿@Type鈭�999");
+                                            } else {
+                                                //绗洓鍒�
+                                                textRenderData.setText(sample.getModel());
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 1) {
+                                            //绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                            } else {
+                                                textRenderData.setText("妫�娴嬬粨鏋�(寰幆" + (i + 1) + ")鈭�1005");
+                                            }
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else if (j == 2) {
+                                            //绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //鏍规嵁娓╁害寰幆
+                                                for (int i1 = 0; i1 < temperature2.size(); i1++) {
+                                                    if (k > (2 * i1) * nm.size() && k <= (2 * i1 + 2) * nm.size()) {
+                                                        //绗笁鍒�
+                                                        textRenderData.setText(temperature2.get(i1) + "鈭�52" + i1);
+                                                        renderData.add(textRenderData);
+                                                        paragraphRenderData.setContents(renderData);
+                                                        paragraphRenderDataList.add(paragraphRenderData);
+                                                        cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                        cells.add(cellRenderData);
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 3) {
+                                            //绗洓琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                for (int j1 = 0; j1 < temperature2.size(); j1++) {
+                                                    for (int i1 = 0; i1 < nm.size(); i1++) {
+                                                        if (k > (i1 + 2 * j1) * nm.size() && k <= (i1 + 2 * j1) * nm.size() + 2) {
+                                                            textRenderData.setText(nm.get(i1));
+                                                            renderData.add(textRenderData);
+                                                            paragraphRenderData.setContents(renderData);
+                                                            paragraphRenderDataList.add(paragraphRenderData);
+                                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                            cells.add(cellRenderData);
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else if (j == 4) {
+                                            //绗簲琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("鍏夌氦鑹叉爣@ScanningNumber鈭�1004");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                textRenderData.setText("|鈭� 伪|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("琛板噺");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 5) {
+                                            //鍊掓暟绗笁琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑鏈�缁堝�肩殑鏈�澶у��
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (((k - 1) / (2 * nm.size())))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //璁＄畻绗�()娓╁害鐨勭()涓」鐩殑鎵�鏈夎壊鏍囩殑骞冲潎鍊肩殑鏈�澶у��
+                                                List<Integer> ips = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) (k / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) (((k + 1) - nm.size()) / 2 % nm.size())))).stream().map(InsProduct::getId).collect(Collectors.toList());
+                                                List<InsProductResult> insProductResults = insProductResultMapper.selDetail(ips);
+                                                Optional<String> max = insProductResults.stream().map(insProductResult -> {
+                                                    return insProductResult.getComValue().split(":")[1].split("\"")[1];
+                                                }).filter(value -> !value.isEmpty()).max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 6) {
+                                            //鍊掓暟绗簩琛�
+                                            if (k == 0) {
+                                                //绗竴鍒�
+                                                textRenderData.setText("|鈭� 伪 max|");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                Optional<String> max = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+                                                        .eq(InsProduct::getInsSampleId, sample.getId())
+                                                        .isNotNull(InsProduct::getInsFiberId)
+                                                        .eq(InsProduct::getInspectionItem, i + 1)
+                                                        .eq(InsProduct::getInspectionItemSubclass, temperature.get((int) ((k - 1) / (2 * nm.size()))))
+                                                        .eq(InsProduct::getInspectionItemClass, nm.get((int) ((k - nm.size()) / 2 % nm.size()))))
+                                                        .stream().map(InsProduct::getLastValue)
+                                                        .filter(value -> !value.isEmpty())
+                                                        .max(String::compareTo);
+                                                if (max.isPresent()) {
+                                                    textRenderData.setText(max.get());
+                                                } else {
+                                                    textRenderData.setText("");
+                                                }
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                textRenderData.setText("-");
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        } else if (j == size2 + 7) {
+                                            //鍊掓暟绗竴琛�
+                                            textRenderData.setText("鈥渱鈭� 伪|鈥濊〃绀洪檮鍔犺“鍑忕粷瀵瑰�尖垜111111");
+                                            renderData.add(textRenderData);
+                                            paragraphRenderData.setContents(renderData);
+                                            paragraphRenderDataList.add(paragraphRenderData);
+                                            cellRenderData.setParagraphs(paragraphRenderDataList);
+                                            cells.add(cellRenderData);
+                                        } else {
+                                            //鍏朵綑濉啓妫�楠屽�肩殑鍐呭
+                                            if (k == 0) {
+                                                //绗竴鍒楀～鍐欒壊鏍�
+                                                textRenderData.setText(insFibers.get((int) (j - 5)).getColor());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else if (k % 2 == 0) {
+                                                //濉啓琛板噺宸氨鏄痩ast_value
+                                                textRenderData.setText(filteredProducts.get((int) ((j - 5) * (temperature.size() - 1) * nm.size() + (temperature.size() * nm.size() * size2) + (k - 2) / 2)).getLastValue());
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            } else {
+                                                //濉啓鍏朵綑姝ｅ父娓╁害鐨勮“鍑�(result琛ㄩ噷闈㈢殑com_value)
+                                                textRenderData.setText(insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, filteredProducts.get((int) ((j - 5) * (temperature.size() - 1) * nm.size() + (temperature.size() * nm.size() * size2) + ((k - 2) + 1) / 2)).getId())).getComValue().split(":")[1].split("\"")[1]);
+                                                renderData.add(textRenderData);
+                                                paragraphRenderData.setContents(renderData);
+                                                paragraphRenderDataList.add(paragraphRenderData);
+                                                cellRenderData.setParagraphs(paragraphRenderDataList);
+                                                cells.add(cellRenderData);
+                                            }
+                                        }
+                                    }
+                                }
+                                rowRenderData.setCells(cells);
+                                if (rowRenderData.getCells().size() != 0) {
+                                    rows.add(rowRenderData);
+                                }
+                            }
+                        }
+                        TableRenderData tableRenderData = new TableRenderData();
+                        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("姣忚鍗曞厓鏍间笉鐩哥瓑");
+                            }
+                        }
+                        TableStyle tableStyle = new TableStyle();
+                        tableStyle.setWidth(XWPFTable.DEFAULT_PERCENTAGE_WIDTH);
+                        tableStyle.setAlign(TableRowAlign.CENTER);
+                        BorderStyle borderStyle = new BorderStyle();
+                        borderStyle.setColor("000000");
+                        borderStyle.setType(XWPFTable.XWPFBorderType.THICK);
+                        borderStyle.setSize(14);
+                        tableStyle.setLeftBorder(borderStyle);
+                        tableStyle.setTopBorder(borderStyle);
+                        tableStyle.setRightBorder(borderStyle);
+                        tableStyle.setBottomBorder(borderStyle);
+                        tableRenderData.setTableStyle(tableStyle);
+                        Map<String, Object> table = new HashMap<>();
+                        table.put("table3", tableRenderData);
+                        table.put("report", insReport);
+                        table.put("index3", index3);
+                        tables3.add(table);
+                        index3++;
+                    }
+                });
+            }
+            tables3.forEach(table3 -> {
+                table3.put("tableSize3", tables3.size());
+            });
 
             /*鑾峰彇闄勪欢鍥剧墖绫诲瀷*/
             List<Map<String, Object>> images = new ArrayList<>();
@@ -1205,6 +3106,11 @@
                         put("tables", tables);
                         put("tableSize", tables.size() + 1);
                         put("tables2", tables2);
+                        put("tableSize2", tables2.size());
+                        put("tables3", tables3);
+                        put("tableSize3", tables3.size());
+                        put("tables4", tables4);
+                        put("tableSize4", tables4.size());
                         put("standardMethod", (standardMethod2.toString().equals("null") ? "" : standardMethod2));
                         put("deviceList", finalDeviceList);
                         put("twoCode", Pictures.ofLocal(codePath).create());
@@ -1246,22 +3152,13 @@
                 FileInputStream stream = new FileInputStream(path);
                 XWPFDocument document = new XWPFDocument(stream);
                 List<XWPFTable> xwpfTables = document.getTables();
-
                 for (int i = 1; i < xwpfTables.size() - (deviceList == null ? 1 : 2); i++) {
                     Set<String> set1 = new HashSet<>();
                     Map<String, Map<String, Integer>> maps = new HashMap<>();
-
-                    XWPFTable table = xwpfTables.get(i);
-                    for (int j = 0; j < table.getRows().size(); j++) {
-                        XWPFTableRow row = table.getRow(j);
-                        if (row == null) continue;
-
-                        for (int k = 0; k < row.getTableCells().size(); k++) {
-                            XWPFTableCell cell = row.getCell(k);
-                            if (cell == null || cell.getText() == null) continue;
-
-                            if (cell.getText().indexOf("鈭�") > -1) {
-                                String[] split = cell.getText().split("鈭�");
+                    for (int j = 0; j < xwpfTables.get(i).getRows().size(); j++) {
+                        for (int k = 0; k < xwpfTables.get(i).getRows().get(j).getTableCells().size(); k++) {
+                            if (xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().indexOf("鈭�") > -1) {
+                                String[] split = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�");
                                 if (set1.add(split[1])) {
                                     Map<String, Integer> map = new HashMap<>();
                                     map.put("sr", j);
@@ -1277,59 +3174,36 @@
                                         map1.put("er", map1.get("er") + 1);
                                     }
                                 }
-
-                                String str = split[0];
-                                cell.removeParagraph(0);
-                                cell.setText(str);
-                                cell.setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
-
-                                if (cell.getParagraphArray(0) != null) {
-                                    cell.getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
-                                }
+                                String str = xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getText().split("鈭�")[0];
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setText(str);
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).setVerticalAlignment(XWPFTableCell.XWPFVertAlign.CENTER);
+                                xwpfTables.get(i).getRows().get(j).getTableCells().get(k).getParagraphArray(0).setAlignment(ParagraphAlignment.CENTER);
                             }
                         }
                     }
-
-                    List<String> list = new ArrayList<>(maps.keySet());
+                    List<String> list = new ArrayList<>();
+                    for (String s : maps.keySet()) {
+                        list.add(s);
+                    }
                     for (int a = list.size() - 1; a >= 0; a--) {
                         Map<String, Integer> v = maps.get(list.get(a));
-                       /* for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
-                            if (v.get("ec") > v.get("sc")) {
-                                TableTools.mergeCellsHorizonal(table, v.get("sr") + j, v.get("sc"), v.get("ec"));
-                            }
-                        }
-                        if (v.get("er") > v.get("sr")) {
-                            TableTools.mergeCellsVertically(table, v.get("sc"), v.get("sr"), v.get("er"));
-                        }*/
                         for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
                             if (v.get("ec") > v.get("sc")) {
-                                XWPFTableRow row = table.getRow(v.get("sr") + j);
-                                if (row != null) {
-                                    for (int col = v.get("sc"); col <= v.get("ec"); col++) {
-                                        XWPFTableCell cell = row.getCell(col);
-                                        if (cell == null) {
-                                            row.createCell(); // 鍒涘缓鏂扮殑鍗曞厓鏍间互闃茬┖鎸囬拡寮傚父
-                                        }
-                                    }
-                                    TableTools.mergeCellsHorizonal(table, v.get("sr") + j, v.get("sc"), v.get("ec"));
+                                try {
+                                    TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+                                } catch (Exception e) {
                                 }
                             }
                         }
                         if (v.get("er") > v.get("sr")) {
-                            for (int rowIdx = v.get("sr"); rowIdx <= v.get("er"); rowIdx++) {
-                                XWPFTableRow row = table.getRow(rowIdx);
-                                if (row != null) {
-                                    XWPFTableCell cell = row.getCell(v.get("sc"));
-                                    if (cell == null) {
-                                        row.createCell(); // 鍒涘缓鏂扮殑鍗曞厓鏍间互闃茬┖鎸囬拡寮傚父
-                                    }
-                                }
+                            try {
+                                TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
+                            } catch (Exception e) {
                             }
-                            TableTools.mergeCellsVertically(table, v.get("sc"), v.get("sr"), v.get("er"));
                         }
                     }
                 }
-
                 FileOutputStream fileOutputStream = new FileOutputStream(path);
                 document.write(fileOutputStream);
                 fileOutputStream.close();
@@ -1338,17 +3212,17 @@
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
+            //澶勭悊涓嫳鏂囨崲琛岀殑闂
             try {
                 FileInputStream stream1 = new FileInputStream(path);
                 XWPFDocument document1 = new XWPFDocument(stream1);
                 List<XWPFTable> xwpfTables1 = document1.getTables();
-                //澶勭悊涓嫳鏂囨崲琛岀殑闂
                 for (int i = 1; i < xwpfTables1.size() - (deviceList == null ? 1 : 2); i++) {
                     for (int j = 0; j < xwpfTables1.get(i).getRows().size(); j++) {
                         for (int k = 0; k < xwpfTables1.get(i).getRows().get(j).getTableCells().size(); k++) {
-                            if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("&")) {
+                            if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@")) {
                                 String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
-                                String[] split = text.split("&");
+                                String[] split = text.split("@");
                                 xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
                                 XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
                                 XWPFRun run = xwpfParagraph.createRun();
@@ -1359,35 +3233,6 @@
                                 }
                                 xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
                             }
-                            /*if (k == 2 || k == 3 || k == 4) {
-                                if (k == 2 && xwpfTables1.get(i).getRows().get(j).getTableCells().get(k-1).getText().contains("@@")) {
-                                    XWPFTableCell cell = xwpfTables1.get(i).getRow(j).getCell(k);
-                                    CTTblWidth tblWidth = cell.getCTTc().addNewTcPr().addNewTcW();
-                                    tblWidth.setType(STTblWidth.DXA);
-                                    tblWidth.setW(BigInteger.valueOf((int) (4.79 * 1440 / 2.54)));
-                                }
-                                if (k == 3 && xwpfTables1.get(i).getRows().get(j).getTableCells().get(k - 2).getText().contains("@@")) {
-                                    XWPFTableCell cell = xwpfTables1.get(i).getRow(j).getCell(k);
-                                    CTTblWidth tblWidth = cell.getCTTc().addNewTcPr().addNewTcW();
-                                    tblWidth.setType(STTblWidth.DXA);
-                                    tblWidth.setW(BigInteger.valueOf((int) (1.49 * 1440 / 2.54)));
-                                }
-                                if (k == 4 && xwpfTables1.get(i).getRows().get(j).getTableCells().get(k - 3).getText().contains("@@")) {
-                                    XWPFTableCell cell = xwpfTables1.get(i).getRow(j).getCell(k);
-                                    CTTblWidth tblWidth = cell.getCTTc().addNewTcPr().addNewTcW();
-                                    tblWidth.setType(STTblWidth.DXA);
-                                    tblWidth.setW(BigInteger.valueOf((int) (3.51 * 1440 / 2.54)));
-                                }
-                            }
-                            if (xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText().contains("@@")) {
-                                String text = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).getText();
-                                text = text.replace("@@","");
-                                xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).removeParagraph(0);
-                                XWPFParagraph xwpfParagraph = xwpfTables1.get(i).getRows().get(j).getTableCells().get(k).addParagraph();
-                                XWPFRun run = xwpfParagraph.createRun();
-                                run.setText(text);
-                                xwpfParagraph.setAlignment(ParagraphAlignment.CENTER);
-                            }*/
                         }
                     }
                 }
@@ -1449,9 +3294,11 @@
                     List<Integer> tt = new ArrayList<>();
                     tt.add(1);
                     if (collect.contains(0)) {
+                        product.setLastValue("涓嶅悎鏍�");
                         product.setInsResult(0);
                     } else if (collect.size() == insProductList.size() && collect.stream().distinct().collect(Collectors.toList()).containsAll(tt)) {
-                        product.setInsResult(0);
+                        product.setLastValue("鍚堟牸");
+                        product.setInsResult(1);
                     }
                     insProductMapper.updateById(product);
                 } else {
@@ -1459,7 +3306,9 @@
                     str += "<br/>" + count + "锛�" + product.getInspectionItem() + " " + product.getInspectionItemSubclass() + "<br/>";
                 }
             }
-            throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
+            if (ObjectUtils.isNotEmpty(str)) {
+                throw new ErrorException("<strong>瀛樺湪寰呮楠岀殑椤圭洰锛�</strong><br/>" + str);
+            }
         }
         insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3).set(InsOrderState::getVerifyUser, verifyUser));
         Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
@@ -1474,6 +3323,17 @@
         info.setJumpPath("b1-inspect-order-plan");
         informationNotificationService.addInformationNotification(info);
         upPlanUser(verifyUser, orderId);
+        /*鏍￠獙涓�涓媟esult琛�*/
+        CompletableFuture.supplyAsync(() -> {
+            List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
+            for (Integer ip : ips) {
+                List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, ip).orderByDesc(InsProductResult::getId));
+                if (insProductResults.size() > 1) {
+                    insProductResultMapper.deleteById(insProductResults.get(0));
+                }
+            }
+            return null;
+        });
         return 1;
     }
 

--
Gitblit v1.9.3