1.大屏业务模块详情提交

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/StringUtils.java

@@ -30,7 +30,7 @@ public class StringUtils {
      * @param map
      * @return
      */
-    public static String transMap2UrlParam(Map<String, Object> map) {
+    public static String transMap2UrlParam(String url,Map<String, Object> map) {
 
         StringBuilder stringBuilder = new StringBuilder();
         for (Map.Entry entry : map.entrySet()) {
@@ -39,11 +39,12 @@ public class StringUtils {
                 continue;
             try {
                 stringBuilder.append("&").append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"));
+                url = url.replaceAll("\\{"+entry.getKey()+"}",entry.getValue()+"");
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
         }
-        return stringBuilder.toString();
+        return url + stringBuilder.toString();
     }
 
     /**
@@ -52,16 +53,17 @@ public class StringUtils {
      * @param list
      * @return
      */
-    public static String transList2UrlParam(List<Map<String, Object>> list) {
+    public static String transList2UrlParam(String url,List<Map<String, Object>> list) {
         StringBuilder stringBuilder = new StringBuilder();
         list.forEach(x -> {
             Map<String, Object> map = JSONObject.parseObject(JSON.toJSONString(x));
             try {
                 stringBuilder.append("&").append(map.get("key")).append("=").append(URLEncoder.encode(map.get("value").toString(), "UTF-8"));
+                url.replaceAll("{"+map.get("key")+"}",map.get("value")+"");
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
         });
-        return stringBuilder.toString();
+        return url + stringBuilder.toString();
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/DPSubServiceImpl.java

@@ -870,9 +870,9 @@ public class DPSubServiceImpl {
             url += "?";
         }
         if (params instanceof Map) {
-            url = url + StringUtils.transMap2UrlParam((Map) params);
+            url = StringUtils.transMap2UrlParam(url, (Map) params);
         } else if (params instanceof List) {
-            url = url + StringUtils.transList2UrlParam((List) params);
+            url = StringUtils.transList2UrlParam(url, (List) params);
         }
         return url.replace("?&", "?");
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/dqjy.json

@@ -5,7 +5,7 @@
       "key": "basic",
       "displayName": "定期检验详情",
       "renderType": "basic",
-      "formSeq": "1734854656288387074",
+      "formSeq": "1735144325639073793",
       "dataConfig": {
         "api": {
           "httpMethod":"GET",