소스 검색

修改bug

zhaoxian 4 년 전
부모
커밋
d886e768f2

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/entity/EtlKuaishouReportAccountHourly.java

@@ -307,6 +307,8 @@ public class EtlKuaishouReportAccountHourly {
     @TableField(exist = false)
     private BigDecimal activationRatio;//下载完成激活率 =激活数/安卓下载完成数
     @TableField(exist = false)
+    private BigDecimal clickOnActivationRatio;//下载完成激活率 =激活数/安卓下载完成数
+    @TableField(exist = false)
     private BigDecimal eventRegisterRatio;//注册率 =当日回传注册数/当日激活数
     @TableField(exist = false)
     private BigDecimal eventNextDayStayRatio;//次日留存率 =次留数/前一日激活数

+ 8 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouAudienceAccountDailyMapper.xml

@@ -120,7 +120,10 @@
                 IFNULL(ROUND(charge/ event_next_day_stay,2),0) as 'value',
             </if>
         </if>
-        IFNULL(ad_scene,'全部') as 'type'
+        CASE
+        WHEN ad_scene is null then '全部'
+        WHEN ad_scene = '' THEN '全部'
+        ELSE ad_scene END as 'type'
         FROM ctop_kuaishou_report_daily_account
         where stat_date &gt;= DATE_FORMAT(date_sub(now(), interval 8 day), '%Y-%m-%d')
         AND stat_date &lt;= DATE_FORMAT(date_sub(now(), interval 2 day), '%Y-%m-%d')
@@ -149,7 +152,10 @@
                 IFNULL(ROUND(SUM(charge)/SUM(event_next_day_stay),2),0) as 'value',
             </if>
         </if>
-        IFNULL(ad_scene,'全部') as 'type'
+        CASE
+        WHEN ad_scene is null then '全部'
+        WHEN ad_scene = '' THEN '全部'
+        ELSE ad_scene END as 'type'
         FROM ctop_kuaishou_report_daily_account
         where stat_date &gt;= DATE_FORMAT(date_sub(now(), interval 8 day), '%Y-%m-%d')
         AND stat_date &lt;= DATE_FORMAT(date_sub(now(), interval 2 day), '%Y-%m-%d')

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/KuaishouVideoEtlInfoMapper.xml

@@ -11,6 +11,7 @@
     <select id="getTotal" resultType="java.lang.Long">
         SELECT count(1)
         FROM ctop_etl_kuaishou_account_material_report_daily t1
+                 INNER JOIN ctop_kuaishou_video_etl_info t2 ON t1.signature = t2.video_code
         WHERE t1.account_id = #{accountId}
           AND t1.stat_date &gt;= #{startTime}
           AND t1.stat_date &lt;= #{endTime}