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:24:26 +08:00
parent 58f9c9a350
commit 778b5f751d
1 changed files with 8 additions and 7 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

@@ -121,17 +121,18 @@ public class ReportDocumentDataServiceImpl implements ReportDocumentDataService
JSONObject dataJson = JSONObject.parseObject(documentContent); JSONObject dataJson = JSONObject.parseObject(documentContent);
if(dataJson == null) if(dataJson == null)
continue; continue;
String usage = dataJson.getString("usage"); if(!dataJson.containsKey(field))
continue;
if(!hasFields.contains( fieldName)){
JSONObject valueJson = dataJson.getJSONObject(field);
String usage = valueJson.getString("usage");
if(!"report".equals( usage) && ! "ingredient_report".equals(usage)) if(!"report".equals( usage) && ! "ingredient_report".equals(usage))
continue; continue;
if(dataJson.containsKey(field)){
if(!hasFields.contains( fieldName)){
fieldList.add(fieldDO); fieldList.add(fieldDO);
hasFields.add(fieldName); hasFields.add(fieldName);
} }
} }
} }
}
assembleStep1(rowList, fieldList, dataListByKey, customConfig, i); //处理后的组数对象 assembleStep1(rowList, fieldList, dataListByKey, customConfig, i); //处理后的组数对象
} }
if(!"1".equals(verticalFlag)){ if(!"1".equals(verticalFlag)){