From 5b3d0f64365ec953df9d1880c3730c3af5b80de9 Mon Sep 17 00:00:00 2001 From: FCL Date: Sat, 28 Feb 2026 10:44:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=B7=A6=E4=BE=A7=E5=9B=BA=E5=AE=9A=E5=88=97?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReportDocumentDataServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java index d3bd0f51..7f1a6e28 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java @@ -440,7 +440,7 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService putEmptyData(emptyRow, 1,10); rowList.add(emptyRow); } - addTitleToRowList(fixedCol, fixedColRight, dynamicColCount, t, rowList, fieldList); + addTitleToRowList(fixedCol, fixedColRight, dynamicColCount, t, rowList, fieldList, i); //插入样品数据 addDataToRowList(fixedCol, fixedColRight, dynamicFieldList, dataList, rowList, fixedColCount_left, dynamicColCount, hasRemark); //检出限 @@ -455,11 +455,12 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService * @param * * */ - private void addTitleToRowList(JSONArray fixedCol, JSONArray fixedColRight, Integer dynamicColCount, JSONObject t, JSONArray rowList, List fieldList){ + private void addTitleToRowList(JSONArray fixedCol, JSONArray fixedColRight, Integer dynamicColCount, JSONObject t, JSONArray rowList, List fieldList, Integer groupIndex){ //处理固定列 int index = 1; String colKey = ""; //固定列-左 + for(int i=0;i