diff --git a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java index 268a590..b393e09 100644 --- a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java +++ b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java @@ -14,4 +14,6 @@ public interface CustomerFormViewMapper { ArrayList getCustomerFormViewListByGroupid(String groupid); CustomerFormView getTableNameByCfid(String formId); + + String getIdByCfid(String cfid); } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index a1dfab8..89ed0d4 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -304,15 +304,18 @@ public class CustomerFormServiceImpl implements CustomerFormService { ArrayList masterTreeList = new ArrayList<>(); String userKey = key; String onlyToShowTableId = ""; + //上线修改 - String url = "http://172.20.2.87:7777/customer_form/gainTableField";//本地+内网 - //String url = "http://36.133.126.182:39250/customer_form/gainTableField";//外网 + String url = "http://172.20.2.87:7777/customer_form/gainTableVersionField";//本地+内网 + //String url = "http://36.133.126.182:39250/customer_form/gainTableVersionField";//外网 if(cfid.contains("zibiaoid-")){ onlyToShowTableId = cfid.split("zibiaoid-")[1]; cfid = cfid.split(":")[0];//当选择某个主表的子表时,连主表数据一并返回。 } JSONObject param = new JSONObject(); - param.put("id", cfid); + String idFilteredVersion = customerFormViewMapper.getIdByCfid(cfid); + System.out.println(idFilteredVersion); + param.put("id", idFilteredVersion); String post = null; /*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 singleAsfChildTableMathsFormula = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("mathsFormula").toString(); String singleAsfChildTableMathsString = ((com.alibaba.fastjson2.JSONObject) filterCondition.get("gongShi")).get("mathsString").toString(); + System.out.println(1); }else{//没有设置筛选条件 @@ -2202,6 +2206,8 @@ public class CustomerFormServiceImpl implements CustomerFormService { } System.out.println(1); + + } } if(resultList.size()>0){ diff --git a/src/main/resources/mapper/CustomerFormvViewMapper.xml b/src/main/resources/mapper/CustomerFormvViewMapper.xml index f6328e0..ce39a2f 100644 --- a/src/main/resources/mapper/CustomerFormvViewMapper.xml +++ b/src/main/resources/mapper/CustomerFormvViewMapper.xml @@ -34,4 +34,12 @@ where status = 1 and cfid = #{formId} + + \ No newline at end of file