|
|
|
@ -218,7 +218,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
JsonNode jsonNode = objectMapper.readTree(post); |
|
|
|
JsonNode data = jsonNode.get("data"); |
|
|
|
|
|
|
|
tree.setId("rootid"); |
|
|
|
tree.setId(cfid); |
|
|
|
tree.setLabel(cfid); |
|
|
|
ArrayNode masterTableArr = (ArrayNode) data.get("masterTable"); |
|
|
|
JsonNode sunTableArrObj = data.get("sunTable"); |
|
|
|
@ -253,7 +253,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
if(sunFlag){//存在子表单
|
|
|
|
for(FieldBean fieldBean:fieldBeanArrayList){ |
|
|
|
Tree tree1 = new Tree(); |
|
|
|
tree1.setId(fieldBean.getField()); |
|
|
|
tree1.setId(tree.getId()+":"+fieldBean.getField()); |
|
|
|
if(StringUtils.isBlank(fieldBean.getComment())){ |
|
|
|
tree1.setLabel(fieldBean.getField()); |
|
|
|
}else{ |
|
|
|
@ -278,14 +278,14 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
} |
|
|
|
for(SunTable sunTable: sunTableArrayList){ |
|
|
|
Tree tree1 = new Tree(); |
|
|
|
tree1.setId("zibiao-"+sunTable.getTableid()); |
|
|
|
tree1.setId(tree.getId()+":"+sunTable.getTableid()); |
|
|
|
tree1.setParentId(tree.getId()); |
|
|
|
tree1.setLabel(sunTable.getTableid()); |
|
|
|
ArrayList<Tree> sunFieldList = new ArrayList<>(); |
|
|
|
for(FieldBean fieldBean: sunTable.getFieldBeans()){ |
|
|
|
|
|
|
|
Tree tree2 = new Tree(); |
|
|
|
tree2.setId(fieldBean.getField()); |
|
|
|
tree2.setId(tree1.getId()+":"+fieldBean.getField()); |
|
|
|
if(StringUtils.isBlank(fieldBean.getComment())){ |
|
|
|
tree2.setLabel(fieldBean.getField()); |
|
|
|
}else{ |
|
|
|
@ -316,7 +316,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
}else{ |
|
|
|
for(FieldBean fieldBean:fieldBeanArrayList){ |
|
|
|
Tree tree1 = new Tree(); |
|
|
|
tree1.setId(fieldBean.getField()); |
|
|
|
tree1.setId(tree.getId()+":"+fieldBean.getField()); |
|
|
|
if(StringUtils.isBlank(fieldBean.getComment())){ |
|
|
|
tree1.setLabel(fieldBean.getField()); |
|
|
|
}else{ |
|
|
|
|