yumeng 4 vuotta sitten
vanhempi
commit
0e71290016

+ 3 - 4
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/JsonResourceUtil.java

@@ -79,14 +79,13 @@ public class JsonResourceUtil {
         return mapMap;
     }
 
-
     /**
      * 拼接字段
      */
     public static String joinFiled(Map<String, Map<String, Object>> mapMap, JSONArray array) {
         StringBuilder sb = new StringBuilder();
         array.forEach(it -> {
-            if (mapMap.get(it) == null) {
+            if (mapMap.get(String.valueOf(it)).isEmpty()) {
                 sb.append(it).append(",");
             } else {
                 sb.append(mapMap.get(it.toString()).get("filed")).append(",");
@@ -101,8 +100,8 @@ public class JsonResourceUtil {
     public static List<String> joinTitle(Map<String, Map<String, Object>> mapMap, JSONArray array) {
         List<String> titles = new ArrayList<>(20);
         array.forEach(it -> {
-            if (mapMap.get(it) == null) {
-                titles.add("");
+            if (mapMap.get(String.valueOf(it)).isEmpty()) {
+                titles.add(String.valueOf(it));
             } else {
                 titles.add(mapMap.get(it.toString()).get("comment").toString());
             }

+ 1 - 1
module-kuaishou/src/main/resources/json_template/kuaishou_filed_mapping.json

@@ -192,7 +192,7 @@
     "comment": "按钮点击率"
   },
   "play3sRate": {
-    "filed": "CASE WHEN sum(CEIL(t1.play_3s_ratio * t1.aclick)) / sum(t1.aclick) IS NULL THEN 0 ELSE round(sum(CEIL(t1.play_3s_ratio * t1.aclick)) / sum(t1.aclick)*100,2)end as play3sRate ",
+    "filed": "CASE WHEN sum(CEIL(t1.play_3s_ratio * t1.aclick)) / sum(t1.aclick) IS NULL THEN 0 ELSE round(sum(CEIL(t1.play_3s_ratio * t1.aclick)) / sum(t1.aclick)*100,2) end as play3sRate ",
     "comment": "3s播放率"
   },
   "activeRate": {