Przeglądaj źródła

Merge branch 'V2.0.1'

zhaoxian 3 lat temu
rodzic
commit
7169c3d13e

+ 18 - 15
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/ManagerSaleValueMapper.xml

@@ -127,26 +127,30 @@
 
     <select id="queryTtManydaysTotalCharge" resultType="String">
         SELECT IFNULL(sum(cost), 0.00)
-        FROM application.bytedance_advertiser_report_daily_dw
-        WHERE account_id in
-        <foreach collection="accountIds" item="id" separator=","
-                 open="(" close=")">
-            #{id}
-        </foreach>
-        and stat_datetime >= DATE_FORMAT(#{startDay}, '%Y%m%d')
+        FROM application.bytedance_advertiser_report_hourly_dw
+        WHERE stat_datetime >= DATE_FORMAT(#{startDay}, '%Y%m%d')
         and stat_datetime &lt; DATE_FORMAT(#{endDay}, '%Y%m%d')
+        <if test="accountIds !=null and accountIds.size()>0">
+            and account_id in
+            <foreach collection="accountIds" item="id" separator=","
+                     open="(" close=")">
+                #{id}
+            </foreach>
+        </if>
     </select>
 
     <select id="queryTtManydaysCharge" resultType="com.alibaba.fastjson.JSONObject">
         SELECT DATE_FORMAT(stat_datetime,'%Y-%m-%d') as 'statDate', IFNULL(sum(cost), 0.00) as 'charge'
         FROM application.bytedance_advertiser_report_hourly_dw
-        WHERE account_id in
-        <foreach collection="accountIds" item="id" separator=","
-                 open="(" close=")">
-            #{id}
-        </foreach>
-        and stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d')
+        WHERE stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d')
         and stat_datetime &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d')
+        <if test="accountIds !=null and accountIds.size()>0">
+            and account_id in
+            <foreach collection="accountIds" item="id" separator=","
+                     open="(" close=")">
+                #{id}
+            </foreach>
+        </if>
         GROUP BY stat_datetime
         order by stat_datetime
     </select>
@@ -170,7 +174,7 @@
 
     <select id="queryKsManydaysTotalCharge" resultType="String">
         SELECT IFNULL(sum(charge), 0.00)
-        FROM application.kuaishou_account_report_daily_dw
+        FROM application.kuaishou_account_report_hourly_dw
         WHERE
         stat_date >= DATE_FORMAT(#{startDay}, '%Y%m%d')
         and stat_date &lt; DATE_FORMAT(#{endDay}, '%Y%m%d')
@@ -203,7 +207,6 @@
                 #{id}
             </foreach>
         </if>
-
         ) thisMonth
         LEFT JOIN (
         SELECT

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

@@ -126,8 +126,8 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds);
             //月消耗
             String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds);
-            result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
-            result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
+            result.put("weekCharge", new BigDecimal(weekCharge));
+            result.put("monthCharge", new BigDecimal(monthCharge));
             //现金消耗 + 环比ROI
             JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));
@@ -138,8 +138,8 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds);
             //月消耗
             String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds);
-            result.put("weekCharge", getBigDecimalVal(weekCharge, result.getBigDecimal("totalCharge")));
-            result.put("monthCharge", getBigDecimalVal(monthCharge, result.getBigDecimal("totalCharge")));
+            result.put("weekCharge", new BigDecimal(weekCharge));
+            result.put("monthCharge", new BigDecimal(monthCharge));
             //现金消耗 + 环比ROI
             JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));