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

Merge branch 'grpU8' of http://ufidahz.com.cn:9015/root/kangarooDataCenterV3 into grpU8

This commit is contained in:
lvleigang 2024-09-14 16:59:55 +08:00
parent ceee0b4b77 8611822520
commit 64d815ab49
2 changed files with 237 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/src/main/java/com/hzya/frame/sysnew/comparison/entity/ComparisonEntity.java
View File

@ -73,6 +73,7 @@ public class ComparisonEntity extends BaseEntity {
this.viewName = viewName; this.viewName = viewName;
} }
public List<String> getReturnField() { public List<String> getReturnField() {
return returnField; return returnField;
} }

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

@ -105,10 +105,10 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
//查询主表数据 //查询主表数据
List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity); List<Map<String,Object>> comparisonEntitiePages = comparisonDao.queryComparisonPage(comparisonEntity);
//递归查询组织树 /* //递归查询组织树
if(comparisonEntities.get(0).getViewName().equals("1")){ if(map.get("viewName").equals("1")){
return recursiveQueryComparison(comparisonEntitiePages,comparisonEntity); return recursiveQueryComparison(comparisonEntitiePages,comparisonEntity);
} }*/
if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){ if(CollectionUtils.isNotEmpty(comparisonEntitiePages)){
for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) { for (Map<String, Object> comparisonEntitiePage : comparisonEntitiePages) {
@ -231,7 +231,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
} else { } else {
//如果是树形结构，查询不存在，新增时候需要得到parent_id,根据parent_id查询data_id是否有，之后将查询得父id设置到mdm_up_id中 //如果是树形结构，查询不存在，新增时候需要得到parent_id,根据parent_id查询data_id是否有，之后将查询得父id设置到mdm_up_id中
if(comparisonEntities.get(0).getViewName().equals("1")){ if(map.get("viewName").equals("1")){
List<String> fieldParent = getFields(comparisonEntity); List<String> fieldParent = getFields(comparisonEntity);
Map<String, Object> mapParentId = new HashMap<>(); Map<String, Object> mapParentId = new HashMap<>();
mapDataId.put("data_id", jsonObjectMain.getString("parent_id")); mapDataId.put("data_id", jsonObjectMain.getString("parent_id"));
@ -464,7 +464,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
} }
//判断是否是树形结构 //判断是否是树形结构
if(comparisonEntities.get(0).getViewName().equals("1")){ if(map.get("viewName").equals("1")){
//根据data_id查询出parent_id，再根据parent_id得值查询data_id字段中为这个得值,如果有，将data_id为parent_id得id值保存到mdm_up_id中 //根据data_id查询出parent_id，再根据parent_id得值查询data_id字段中为这个得值,如果有，将data_id为parent_id得id值保存到mdm_up_id中
Map<String,Object> mapParent=new HashMap<>(); Map<String,Object> mapParent=new HashMap<>();
mapParent.put("data_id",comparisonEntitiePages.get(0).get("parent_id")); mapParent.put("data_id",comparisonEntitiePages.get(0).get("parent_id"));
@ -623,7 +623,7 @@ public class ComparisonServiceImpl extends BaseService<ComparisonEntity, String>
} }
//递归删除树结构 1.树 2.列表 //递归删除树结构 1.树 2.列表
if(comparisonEntities.get(0).getViewName().equals("1")){ if(map.get("viewName").equals("1")){
return recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity); return recursiveDeleteComparison(comparisonEntitiePages,comparisonEntity);
} }