Browse Source

release of '素材大盘' on 2021.3.22

jiequan.bi 4 năm trước cách đây
mục cha
commit
b07ed0cbf7

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/MaterialReportOverViewMapper.xml

@@ -625,12 +625,12 @@
     <select id="queryBytedancePlay100RateByMd5" resultType="com.alibaba.fastjson.JSONObject">
         select play100Rate
         from (
-        SELECT round(sum(play100_feed_break) / sum(material_show), 2) play100Rate,
+        SELECT ifnull(round(sum(play100_feed_break) / sum(material_show), 2),0) play100Rate,
             1 as num
         FROM etl_report_bytedance_video
         WHERE md5 = #{md5}
         union all
-        SELECT MAX(play100Rate) top,
+        SELECT ifnull(MAX(play100Rate),0) top,
             2 as num
         FROM (
                  SELECT round(sum(play100_feed_break) / sum(material_show), 2) play100Rate
@@ -639,7 +639,7 @@
                  GROUP BY md5
              ) t
         union all
-        SELECT ROUND(sum(play100_feed_break) / sum(material_show), 2) average,
+        SELECT ifnull(ROUND(sum(play100_feed_break) / sum(material_show), 2),0) average,
             3 as num
         FROM etl_report_bytedance_video
         WHERE project_id = #{project}

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/MaterialReportOverViewServiceImpl.java

@@ -385,7 +385,7 @@ public class MaterialReportOverViewServiceImpl implements IMaterialReportOverVie
     }
 
     //环比计算
-    public  BigDecimal countLink(BigDecimal numA, BigDecimal numB) {
+    private  BigDecimal countLink(BigDecimal numA, BigDecimal numB) {
         BigDecimal link = new BigDecimal(0);
         if (numB.compareTo(BigDecimal.ZERO)!=0) {
             link = (numA.subtract(numB)).divide(numB, 4, RoundingMode.HALF_UP);