|
|
@ -59,7 +59,8 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
|
|
|
|
|
Tree tree = new Tree(); |
|
|
Tree tree = new Tree(); |
|
|
tree.setId("rootid"); |
|
|
tree.setId("rootid"); |
|
|
tree.setLabel("选择表单"); |
|
|
tree.setLabel("请选择表单"); |
|
|
|
|
|
tree.setValue("rootvalue"); |
|
|
//筛选出所有表单中,当前用户有权限的表单
|
|
|
//筛选出所有表单中,当前用户有权限的表单
|
|
|
for(CustomerForm c:customerFormList){ |
|
|
for(CustomerForm c:customerFormList){ |
|
|
|
|
|
|
|
|
@ -157,6 +158,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
tree1.setId(item.getId()); |
|
|
tree1.setId(item.getId()); |
|
|
tree1.setParentId(tree.getId()); |
|
|
tree1.setParentId(tree.getId()); |
|
|
tree1.setLabel(item.getName()); |
|
|
tree1.setLabel(item.getName()); |
|
|
|
|
|
tree1.setValue(item.getId()); |
|
|
HashMap<String,Object> treeAttrs = new HashMap<>(); |
|
|
HashMap<String,Object> treeAttrs = new HashMap<>(); |
|
|
treeAttrs.put("version",item.getVersion().toString()); |
|
|
treeAttrs.put("version",item.getVersion().toString()); |
|
|
tree1.setTreeAttrs(treeAttrs); |
|
|
tree1.setTreeAttrs(treeAttrs); |
|
|
@ -175,6 +177,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
tree2.setLabel(l); |
|
|
tree2.setLabel(l); |
|
|
tree2.setParentId(tree1.getId()); |
|
|
tree2.setParentId(tree1.getId()); |
|
|
tree2.setId("zibiaoid-"+l); |
|
|
tree2.setId("zibiaoid-"+l); |
|
|
|
|
|
tree2.setValue(tree2.getId()); |
|
|
treeArrayList.add(tree2); |
|
|
treeArrayList.add(tree2); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -190,9 +193,12 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public Tree getFieldTree(String key,String token,String cfid) { |
|
|
public Tree getFieldTree(String key,String token,String cfid) { |
|
|
|
|
|
Boolean flag = StringUtils.isBlank(cfid); |
|
|
|
|
|
System.out.println(StringUtils.isBlank(cfid)); |
|
|
Tree tree = new Tree(); |
|
|
Tree tree = new Tree(); |
|
|
if(StringUtils.isBlank(key)||StringUtils.isBlank(token)||StringUtils.isBlank(cfid)){ |
|
|
if(StringUtils.isBlank(key)||StringUtils.isBlank(token)||StringUtils.isBlank(cfid)){ |
|
|
//参数不全不能发送请求.
|
|
|
//参数不全不能发送请求.
|
|
|
|
|
|
tree.setId("cfid为空"); |
|
|
}else{ |
|
|
}else{ |
|
|
Boolean sunFlag = false; |
|
|
Boolean sunFlag = false; |
|
|
//子表列表
|
|
|
//子表列表
|
|
|
@ -226,10 +232,10 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
JsonNode data = jsonNode.get("data"); |
|
|
JsonNode data = jsonNode.get("data"); |
|
|
|
|
|
|
|
|
tree.setId("formField:"+cfid); |
|
|
tree.setId("formField:"+cfid); |
|
|
tree.setLabel(cfid); |
|
|
tree.setLabel("表单-"+cfid); |
|
|
|
|
|
|
|
|
HashMap<String,Object> showMap = new HashMap<>(); |
|
|
HashMap<String,Object> showMap = new HashMap<>(); |
|
|
showMap.put("show",cfid); |
|
|
showMap.put("show","表单-"+cfid); |
|
|
tree.setTreeAttrs(showMap); |
|
|
tree.setTreeAttrs(showMap); |
|
|
|
|
|
|
|
|
ArrayNode masterTableArr = (ArrayNode) data.get("masterTable"); |
|
|
ArrayNode masterTableArr = (ArrayNode) data.get("masterTable"); |
|
|
|