ソースを参照

Merge branch 'V2.0.1'

zhaoxian 3 年 前
コミット
a6566109cf

+ 14 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/KuaishouAccountReportDailyDwMapper.xml

@@ -497,7 +497,7 @@
         t3.lastCost,
         CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
         AS 'yearOnYearCost',
-        '-' as 'unitNum'
+        t4.unitNum
         FROM
         (
         SELECT
@@ -546,7 +546,19 @@
             </foreach>
         </if>
         ) t3 ON 1 = 1
-
+        LEFT JOIN (
+        SELECT IFNULL(SUM(new_all_unit_num),'-') as 'unitNum'
+        FROM application.app_kuaishou_account_today_base_info_d
+        WHERE stat_date >= #{startDate}
+        AND stat_date &lt;= #{endDate}
+        <if test='list!=null'>
+            AND user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) t4 ON 1=1
     </select>
 
     <select id="getKuaishouOperateGroupInfo" resultType="com.alibaba.fastjson.JSONObject">