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

Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project

This commit is contained in:
yuqh 2024-06-24 18:06:12 +08:00
parent dfc406864b 4b27586193
commit 9637c73b96
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) {
JSONObject jsonObjects=new JSONObject();
jsonObjects.put(comparisonEntity.getDbName(),comparisonEntitiePage);
if(comparisonDetailsEntity.getDbName()!=null){
comparisonDetailsEntity.setFormmainId(String.valueOf(comparisonEntitiePage.get("id")));
//查询明细表数据
List<Map<String, Object>> maps = comparisonDetailsDao.queryComparisonDetailsPage(comparisonDetailsEntity);
@ -108,6 +109,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
}else {
jsonObjects.put(comparisonDetailsEntity.getDbName(),new JSONArray());
}
}
list.add(jsonObjects);
}
}