zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

Browse Source
This commit is contained in:
王兴荣
2026-02-28 10:45:10 +08:00
parent c9478c9c60 5b3d0f6436
commit 4885f6877b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentDataServiceImpl.java
View File

@@ -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<ConfigReportFieldDO> fieldList){
private void addTitleToRowList(JSONArray fixedCol, JSONArray fixedColRight, Integer dynamicColCount, JSONObject t, JSONArray rowList, List<ConfigReportFieldDO> fieldList, Integer groupIndex){
//处理固定列
int index = 1;
String colKey = "";
//固定列-左
for(int i=0;i<fixedCol.size();i++) {
String col = fixedCol.getString(i);
for(ConfigReportFieldDO fieldDO : fieldList) {
@@ -478,7 +479,11 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
colKey = parseNumToString(index, 2);
}
if(!ObjectUtils.isEmpty(colKey)){
if(groupIndex == 0) {
t.put(colPrefix + colKey, fieldName);
}else{
t.put(colPrefix + colKey, " ");
}
index++;
}
}