hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整通用数据查询返回格式

This commit is contained in:
hecan 2024-06-21 11:37:24 +08:00
parent d4b2ff16ff
commit 8ab6b88fb0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
service/src/main/java/com/hzya/frame/sysnew/comparison/service/impl/ComparisonServiceImpl.java
View File

@ -93,20 +93,25 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
} }
comparisonEntity.setMap(map); comparisonEntity.setMap(map);
try { try {
List<JSONObject> list=new ArrayList<>();
//查询主表数据
List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
JSONArray jsonArray=new JSONArray();
if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){ if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) { for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) {
comparisonDetailsEntity.setFormmainId(String.valueOf(comparisonEntitiePage.get("id")));
List<Map<String, Object>> maps = comparisonDetailsDao.queryComparisonDetailsPage(comparisonDetailsEntity);
jsonArray.add(maps);
}
}
JSONObject jsonObjects=new JSONObject(); JSONObject jsonObjects=new JSONObject();
jsonObjects.put("main",comparisonEntitiePages); jsonObjects.put(comparisonEntity.getDbName(),comparisonEntitiePage);
jsonObjects.put("details",jsonArray); comparisonDetailsEntity.setFormmainId(String.valueOf(comparisonEntitiePage.get("id")));
List<JSONObject> jsonObjects1 = JSON.parseArray(jsonObjects.toJSONString(), JSONObject.class); //查询明细表数据
PageInfo pageInfo = new PageInfo(jsonObjects1); List<Map<String, Object>> maps = comparisonDetailsDao.queryComparisonDetailsPage(comparisonDetailsEntity);
if(CollectionUtils.isNotEmpty(maps)){
jsonObjects.put(comparisonDetailsEntity.getDbName(),maps);
}else {
jsonObjects.put(comparisonDetailsEntity.getDbName(),new JSONArray());
}
list.add(jsonObjects);
}
}
PageInfo pageInfo = new PageInfo(list);
return BaseResult.getSuccessMessageEntity("查询成功", pageInfo); return BaseResult.getSuccessMessageEntity("查询成功", pageInfo);
} catch (Exception e) { } catch (Exception e) {
logger.info("查询通用数据错误:{}", e.getMessage()); logger.info("查询通用数据错误:{}", e.getMessage());