|
|
@ -304,15 +304,18 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
ArrayList<Tree> masterTreeList = new ArrayList<>(); |
|
|
ArrayList<Tree> masterTreeList = new ArrayList<>(); |
|
|
String userKey = key; |
|
|
String userKey = key; |
|
|
String onlyToShowTableId = ""; |
|
|
String onlyToShowTableId = ""; |
|
|
|
|
|
|
|
|
//上线修改
|
|
|
//上线修改
|
|
|
String url = "http://172.20.2.87:7777/customer_form/gainTableField";//本地+内网
|
|
|
String url = "http://172.20.2.87:7777/customer_form/gainTableVersionField";//本地+内网
|
|
|
//String url = "http://36.133.126.182:39250/customer_form/gainTableField";//外网
|
|
|
//String url = "http://36.133.126.182:39250/customer_form/gainTableVersionField";//外网
|
|
|
if(cfid.contains("zibiaoid-")){ |
|
|
if(cfid.contains("zibiaoid-")){ |
|
|
onlyToShowTableId = cfid.split("zibiaoid-")[1]; |
|
|
onlyToShowTableId = cfid.split("zibiaoid-")[1]; |
|
|
cfid = cfid.split(":")[0];//当选择某个主表的子表时,连主表数据一并返回。
|
|
|
cfid = cfid.split(":")[0];//当选择某个主表的子表时,连主表数据一并返回。
|
|
|
} |
|
|
} |
|
|
JSONObject param = new JSONObject(); |
|
|
JSONObject param = new JSONObject(); |
|
|
param.put("id", cfid); |
|
|
String idFilteredVersion = customerFormViewMapper.getIdByCfid(cfid); |
|
|
|
|
|
System.out.println(idFilteredVersion); |
|
|
|
|
|
param.put("id", idFilteredVersion); |
|
|
String post = null; |
|
|
String post = null; |
|
|
|
|
|
|
|
|
/*System.out.println("requestBody:"+param); |
|
|
/*System.out.println("requestBody:"+param); |
|
|
@ -2163,6 +2166,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
String singleAsfChildTableFormulaHtml = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("formulaHtml").toString(); |
|
|
String singleAsfChildTableFormulaHtml = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("formulaHtml").toString(); |
|
|
String singleAsfChildTableMathsFormula = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("mathsFormula").toString(); |
|
|
String singleAsfChildTableMathsFormula = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("mathsFormula").toString(); |
|
|
String singleAsfChildTableMathsString = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("mathsString").toString(); |
|
|
String singleAsfChildTableMathsString = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("mathsString").toString(); |
|
|
|
|
|
System.out.println(1); |
|
|
}else{//没有设置筛选条件
|
|
|
}else{//没有设置筛选条件
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2202,6 +2206,8 @@ public class CustomerFormServiceImpl implements CustomerFormService { |
|
|
} |
|
|
} |
|
|
System.out.println(1); |
|
|
System.out.println(1); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if(resultList.size()>0){ |
|
|
if(resultList.size()>0){ |
|
|
|