浏览代码

Merge remote-tracking branch 'origin/master'

syh 4 年之前
父节点
当前提交
0cba32e160

+ 2 - 2
module-job-bytedance/src/main/resources/application.yml

@@ -2,8 +2,8 @@ server:
   port: 8091
 spring:
   profiles:
-#    active: @activatedProperties@
-    active: test
+    active: @activatedProperties@
+ #   active: test
   application:
     name: system-web
 swagger:

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

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

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/link/entity/ETLReportBytedanceVideo.java

@@ -374,7 +374,7 @@ public class ETLReportBytedanceVideo {
 	/**materailShow*/
 	@Excel(name = "materailShow", width = 15)
     @ApiModelProperty(value = "materailShow")
-	private Long materailShow;
+	private Long materialShow;
 	/**转化数据-转化率*/
 	@Excel(name = "转化数据-转化率", width = 15)
     @ApiModelProperty(value = "转化数据-转化率")