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

fix:报告数据微调

Browse Source
This commit is contained in:
FCL
2025-11-05 17:22:03 +08:00
parent 166cb7304f
commit dafdefd378
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,8 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
* @param customConfig 报告配置项 * @param customConfig 报告配置项
* */ * */
private List<JSONObject> assembleStep1(List<ConfigReportFieldDO> fieldList, List<ReportDocumentDataDO> dataList, String customConfig){ private List<JSONObject> assembleStep1(List<ConfigReportFieldDO> fieldList, List<ReportDocumentDataDO> dataList, String customConfig){
if(dataList.isEmpty())
return new ArrayList<>();
JSONObject jsonObject = JSONObject.parseObject(customConfig); JSONObject jsonObject = JSONObject.parseObject(customConfig);
Integer dynamicColCount = 3; Integer dynamicColCount = 3;
Integer fixedColCount = 3; Integer fixedColCount = 3;
@@ -263,8 +265,10 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
String colKey = colPrefix + "01"; String colKey = colPrefix + "01";
t = new JSONObject(); t = new JSONObject();
t.put(colKey, "以下为空白"); t.put(colKey, "以下为空白");
int rowIndex = (dataLength + emptyRowCount) * (rowAssist) + 1; int rowIndex = (dataLength + emptyRowCount) * (rowAssist) + 2;
rowList.set(rowIndex + 1, t.clone()); if(rowAssist == 1)
rowIndex = dataLength + emptyRowCount;
rowList.set(rowIndex, t.clone());
} }
//前面的计数是从1开始，移除第一个元素 //前面的计数是从1开始，移除第一个元素
if(!rowList.isEmpty()) if(!rowList.isEmpty())