From 2a8fa67c7f014a943892989c6f4cfdd3baf32590 Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Sat, 14 Sep 2024 11:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=AD=97=E6=AE=B5=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E5=8C=85=E6=8B=AC=E4=BA=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=AD=97=E6=AE=B5=E5=92=8C=E5=B7=B2=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=E7=9A=84bug=E8=A7=A3?= =?UTF-8?q?=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxgk/lowcode/mapper/CustomerFormViewMapper.java | 2 ++ .../service/impl/CustomerFormServiceImpl.java | 12 +++++++++--- .../resources/mapper/CustomerFormvViewMapper.xml | 8 ++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) 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