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

fix:报告数据组装

Browse Source
This commit is contained in:
FCL
2025-12-26 10:49:56 +08:00
parent cc5e04bb40
commit 91815c5e84
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,8 +236,19 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
} }
if(!remainingRows.isEmpty()){ if(!remainingRows.isEmpty()){
JSONObject firstRemainingRow = remainingRows.getJSONObject(0); JSONObject firstRemainingRow = remainingRows.getJSONObject(0);
if(!rowTypeTitle.equals(firstRemainingRow.getString(rowTypeKey))){ String val01 = firstRemainingRow.getString(colPrefix + "01");
if(!ObjectUtils.isEmpty(val01) && !" ".equals(val01) && !rowTypeTitle.equals(firstRemainingRow.getString(rowTypeKey))){
//如果下一页的第一行不为空，且不是标题行，则插入标题
remainingRows.add(0, lastTitleRow); remainingRows.add(0, lastTitleRow);
}else{
//如果下一页的第一行为空，则删除空行
while (ObjectUtils.isEmpty(val01) || " ".equals(val01)){
remainingRows.remove(0);
if(remainingRows.isEmpty())
break;
firstRemainingRow = remainingRows.getJSONObject(0);
val01 = firstRemainingRow.getString(colPrefix + "01");
}
} }
} }
pageRowList.add(pageRow); pageRowList.add(pageRow);