|
|
|
@ -227,6 +227,11 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
|
|
|
|
tree.setId("formField:"+cfid); |
|
|
|
tree.setLabel(cfid); |
|
|
|
|
|
|
|
HashMap<String,Object> showMap = new HashMap<>(); |
|
|
|
showMap.put("show",cfid); |
|
|
|
tree.setTreeAttrs(showMap); |
|
|
|
|
|
|
|
ArrayNode masterTableArr = (ArrayNode) data.get("masterTable"); |
|
|
|
JsonNode sunTableArrObj = data.get("sunTable"); |
|
|
|
|
|
|
|
@ -261,12 +266,23 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
for(FieldBean fieldBean:fieldBeanArrayList){ |
|
|
|
Tree tree1 = new Tree(); |
|
|
|
tree1.setId(tree.getId()+":"+fieldBean.getField()); |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
if(StringUtils.isBlank(fieldBean.getComment())){ |
|
|
|
tree1.setLabel(fieldBean.getField()); |
|
|
|
|
|
|
|
|
|
|
|
map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getField()); |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
tree1.setLabel(fieldBean.getComment()); |
|
|
|
|
|
|
|
|
|
|
|
map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getComment()); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
map.put("field",fieldBean.getField()); |
|
|
|
map.put("type",fieldBean.getType()); |
|
|
|
map.put("attribute",fieldBean.getAttribute()); |
|
|
|
@ -288,17 +304,33 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
tree1.setId(tree.getId()+":"+sunTable.getTableid()); |
|
|
|
tree1.setParentId(tree.getId()); |
|
|
|
tree1.setLabel(sunTable.getTableid()); |
|
|
|
|
|
|
|
HashMap<String,Object> showMap1 = new HashMap<>(); |
|
|
|
showMap1.put("show",tree.getTreeAttrs().get("show")+"."+sunTable.getTableid()); |
|
|
|
tree1.setTreeAttrs(showMap1); |
|
|
|
|
|
|
|
ArrayList<Tree> sunFieldList = new ArrayList<>(); |
|
|
|
for(FieldBean fieldBean: sunTable.getFieldBeans()){ |
|
|
|
|
|
|
|
Tree tree2 = new Tree(); |
|
|
|
tree2.setId(tree1.getId()+":"+fieldBean.getField()); |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
if(StringUtils.isBlank(fieldBean.getComment())){ |
|
|
|
tree2.setLabel(fieldBean.getField()); |
|
|
|
|
|
|
|
|
|
|
|
map.put("show",tree1.getTreeAttrs().get("show")+"."+fieldBean.getField()); |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
tree2.setLabel(fieldBean.getComment()); |
|
|
|
|
|
|
|
|
|
|
|
map.put("show",tree1.getTreeAttrs().get("show")+"."+fieldBean.getComment()); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
map.put("field",fieldBean.getField()); |
|
|
|
map.put("type",fieldBean.getType()); |
|
|
|
map.put("attribute",fieldBean.getAttribute()); |
|
|
|
@ -324,12 +356,23 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
for(FieldBean fieldBean:fieldBeanArrayList){ |
|
|
|
Tree tree1 = new Tree(); |
|
|
|
tree1.setId(tree.getId()+":"+fieldBean.getField()); |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
if(StringUtils.isBlank(fieldBean.getComment())){ |
|
|
|
tree1.setLabel(fieldBean.getField()); |
|
|
|
|
|
|
|
|
|
|
|
map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getField()); |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
tree1.setLabel(fieldBean.getComment()); |
|
|
|
|
|
|
|
|
|
|
|
map.put("show",tree.getTreeAttrs().get("show")+"."+fieldBean.getComment()); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
HashMap<String,Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
map.put("field",fieldBean.getField()); |
|
|
|
map.put("type",fieldBean.getType()); |
|
|
|
map.put("attribute",fieldBean.getAttribute()); |
|
|
|
|