Parcourir la source

优化销售盯盘页面:
getHomeCharges
getDayAndMonthlyCharges

zhaoxian il y a 1 an
Parent
commit
2bacbddea4

+ 12 - 12
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/ManagerSaleValueMapper.java

@@ -38,24 +38,24 @@ public interface ManagerSaleValueMapper extends BaseMapper<ManagerSaleValue> {
      * -----------------------------------------------------
      */
 
-    JSONObject queryTtTodayCharge(@Param("statDay") String statDay, @Param("hour") Integer hour, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    JSONObject queryTtTodayCharge(@Param("statDay") String statDay, @Param("hour") Integer hour, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    JSONObject queryTtTodayCharge2(@Param("statDay") String statDay, @Param("endTime") String endTime, @Param("hour") Integer hour, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId, @Param("days") long days);
+    JSONObject queryTtTodayCharge2(@Param("statDay") String statDay, @Param("endTime") String endTime, @Param("hour") Integer hour, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId, @Param("days") long days);
 
     JSONObject queryTtTodayCharge3(@Param("statDay") String statDay, @Param("endTime") String endTime, @Param("mediaId") String mediaId, @Param("hour") Integer hour, @Param("companyId") String companyId, @Param("days") long days);
 
-    String queryTtManydaysTotalCharge(@Param("startDay") String startDay, @Param("endDay") String endDay, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    String queryTtManydaysTotalCharge(@Param("startDay") String startDay, @Param("endDay") String endDay, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
     JSONObject queryTtRealCharged(@Param("lastMonthFirstday") String lastMonthFirstday, @Param("monthFirstday") String monthFirstday, @Param("statDay") String statDay, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
 
 
-    JSONObject queryKsTodayCharge(@Param("statDay") String statDay, @Param("hour") Integer hour, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    JSONObject queryKsTodayCharge(@Param("statDay") String statDay, @Param("hour") Integer hour, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    JSONObject queryKsTodayCharge2(@Param("statDay") String statDay, @Param("endTime") String endTime, @Param("hour") Integer hour, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId, @Param("days") long days);
+    JSONObject queryKsTodayCharge2(@Param("statDay") String statDay, @Param("endTime") String endTime, @Param("hour") Integer hour, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId, @Param("days") long days);
 
     JSONObject queryKsTodayCharge3(@Param("statDay") String statDay, @Param("endTime") String endTime, @Param("mediaId") String mediaId, @Param("hour") Integer hour, @Param("companyId") String companyId, @Param("days") long days);
 
-    String queryKsManydaysTotalCharge(@Param("startDay") String startDay, @Param("endDay") String endDay, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    String queryKsManydaysTotalCharge(@Param("startDay") String startDay, @Param("endDay") String endDay, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
     JSONObject queryKsRealCharged(@Param("lastMonthFirstday") String lastMonthFirstday, @Param("monthFirstday") String monthFirstday, @Param("statDay") String statDay, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
 
@@ -63,17 +63,17 @@ public interface ManagerSaleValueMapper extends BaseMapper<ManagerSaleValue> {
 
     Long getMonthly(@Param("userId") String userId, @Param("companyId") String companyId, @Param("mediaId") String mediaId);
 
-    List<JSONObject> queryKsHourList(@Param("statDay") String statDay, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    List<JSONObject> queryKsHourList(@Param("statDay") String statDay, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    List<JSONObject> queryTtHourList(@Param("statDay") String statDay, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    List<JSONObject> queryTtHourList(@Param("statDay") String statDay, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    JSONObject queryTtManydaysChargeAndRoi(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("lastTimeStart") String lastTimeStart, @Param("lastTimeEnd") String lastTimeEnd, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    JSONObject queryTtManydaysChargeAndRoi(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("lastTimeStart") String lastTimeStart, @Param("lastTimeEnd") String lastTimeEnd, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    List<JSONObject> queryTtManydaysCharge(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    List<JSONObject> queryTtManydaysCharge(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    JSONObject queryKsManydaysChargeAndRoi(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("lastTimeStart") String lastTimeStart, @Param("lastTimeEnd") String lastTimeEnd, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    JSONObject queryKsManydaysChargeAndRoi(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("lastTimeStart") String lastTimeStart, @Param("lastTimeEnd") String lastTimeEnd, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
-    List<JSONObject> queryKsManydaysCharge(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("accountIds") List<Long> accountIds, @Param("companyId") String companyId);
+    List<JSONObject> queryKsManydaysCharge(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("saleTeaMber") List<String> saleTeaMber, @Param("companyId") String companyId);
 
     List<Long> querySalesDirectorProjectIds(@Param("companyId") String companyId, @Param("mediaId") String mediaId, @Param("userIds") List<String> saleTeaMber);
 

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

@@ -138,9 +138,9 @@
         SELECT sum(charge) as 'charge'
         FROM application.kuaishou_account_report_daily_dw
         <where>
-            <if test="accountIds !=null and accountIds.size()>0">
-                AND account_id in
-                <foreach collection="accountIds" item="id" separator=","
+            <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+                AND sale_id in
+                <foreach collection="saleTeaMber" item="id" separator=","
                          open="(" close=")">
                     #{id}
                 </foreach>
@@ -153,9 +153,9 @@
         SELECT sum(charge) as 'charge'
         FROM application.kuaishou_account_report_daily_dw
         where stat_date = DATE_FORMAT(DATE_ADD(#{statDay},INTERVAL -1 day), '%Y%m%d')
-        <if test="accountIds !=null and accountIds.size()>0">
-            AND account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -171,9 +171,9 @@
         SELECT sum(charge) as 'charge'
         FROM application.kuaishou_account_report_daily_dw
         <where>
-            <if test="accountIds !=null and accountIds.size()>0">
-                AND account_id in
-                <foreach collection="accountIds" item="id" separator=","
+            <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+                AND sale_id in
+                <foreach collection="saleTeaMber" item="id" separator=","
                          open="(" close=")">
                     #{id}
                 </foreach>
@@ -188,9 +188,9 @@
         FROM application.kuaishou_account_report_daily_dw
         where stat_date >= DATE_FORMAT(DATE_ADD(#{statDay},INTERVAL -#{days} day), '%Y%m%d')
         AND stat_date &lt;= DATE_FORMAT(DATE_ADD(#{endTime},INTERVAL -#{days} day), '%Y%m%d')
-        <if test="accountIds !=null and accountIds.size()>0">
-            AND account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -295,9 +295,9 @@
         SELECT sum(cost) as 'charge'
         FROM application.bytedance_advertiser_report_daily_dw
         where stat_datetime = DATE_FORMAT(#{statDay}, '%Y%m%d')
-        <if test="accountIds !=null and accountIds.size()>0">
-            and account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -308,9 +308,9 @@
         SELECT sum(cost) as 'charge'
         FROM application.bytedance_advertiser_report_daily_dw
         WHERE stat_datetime = DATE_FORMAT(DATE_ADD(#{statDay},INTERVAL -1 day), '%Y%m%d')
-        <if test="accountIds !=null and accountIds.size()>0">
-            and account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -326,9 +326,9 @@
         FROM application.bytedance_advertiser_report_daily_dw
         where stat_datetime >= DATE_FORMAT(#{statDay}, '%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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -340,9 +340,9 @@
         FROM application.bytedance_advertiser_report_daily_dw
         WHERE stat_datetime >= DATE_FORMAT(DATE_ADD(#{statDay},INTERVAL -#{days} day), '%Y%m%d')
         AND stat_datetime &lt;=DATE_FORMAT(DATE_ADD(#{endTime},INTERVAL -#{days} day), '%Y%m%d')
-        <if test="accountIds !=null and accountIds.size()>0">
-            and account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -446,9 +446,9 @@
         FROM application.bytedance_advertiser_report_daily_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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -460,9 +460,9 @@
         FROM application.bytedance_advertiser_report_daily_dw
         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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -477,9 +477,9 @@
         WHERE
         stat_date >= DATE_FORMAT(#{startTime}, '%Y%m%d')
         and stat_date &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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -494,9 +494,9 @@
         WHERE
         stat_date >= DATE_FORMAT(#{startDay}, '%Y%m%d')
         and stat_date &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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            and sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -625,9 +625,9 @@
         SELECT hour,sum(charge) as 'charge'
         FROM application.kuaishou_account_report_hourly_dw
         WHERE stat_date = DATE_FORMAT(#{statDay}, '%Y%m%d' )
-        <if test="accountIds !=null and accountIds.size()>0">
-            AND account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -640,9 +640,9 @@
         SELECT hour,sum(cost) as 'charge'
         FROM application.bytedance_advertiser_report_hourly_dw
         WHERE stat_datetime = DATE_FORMAT(#{statDay}, '%Y%m%d' )
-        <if test="accountIds !=null and accountIds.size()>0">
-            AND account_id in
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id in
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -665,9 +665,9 @@
         application.bytedance_advertiser_report_daily_dw
         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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id IN
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -680,9 +680,9 @@
         application.bytedance_advertiser_report_daily_dw
         WHERE stat_datetime >= DATE_FORMAT( #{lastTimeStart}, '%Y%m%d' )
         AND stat_datetime &lt;= DATE_FORMAT( #{lastTimeEnd}, '%Y%m%d' )
-        <if test="accountIds !=null and accountIds.size()>0">
-            AND account_id IN
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id IN
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -704,9 +704,9 @@
         application.kuaishou_account_report_daily_dw
         WHERE stat_date >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND stat_date &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=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id IN
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>
@@ -719,9 +719,9 @@
         application.kuaishou_account_report_daily_dw
         WHERE stat_date >= DATE_FORMAT( #{lastTimeStart}, '%Y%m%d' )
         AND stat_date &lt;= DATE_FORMAT( #{lastTimeEnd}, '%Y%m%d' )
-        <if test="accountIds !=null and accountIds.size()>0">
-            AND account_id IN
-            <foreach collection="accountIds" item="id" separator=","
+        <if test="saleTeaMber !=null and saleTeaMber.size()>0">
+            AND sale_id IN
+            <foreach collection="saleTeaMber" item="id" separator=","
                      open="(" close=")">
                 #{id}
             </foreach>

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

@@ -131,14 +131,14 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         //1 头条
         if ("1".equals(mediaId)) {
             //查询当日消耗 + 环比
-            result = baseMapper.queryTtTodayCharge(statDay, hour, accountIds, null);
+            result = baseMapper.queryTtTodayCharge(statDay, hour, saleTeaMber, null);
             //周消耗
-            weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds, null);
+            weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, saleTeaMber, null);
             //月消耗
-            String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds, null);
+            String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, saleTeaMber, null);
             result.put("weekCharge", new BigDecimal(weekCharge));
             result.put("monthCharge", new BigDecimal(monthCharge));
-            //现金消耗 + 环比ROI
+            //现金消耗 + 环比ROI  因为存在非本地账户,所以只能用本地账户查询现金消耗
             JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, null);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));
             result.put("realChargedRoi", realCharged.getString("realChargedRoi"));
@@ -147,7 +147,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             if (!startTime.equals(statDay)) {
                 hour = 23;
             }
-            JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, accountIds, null, days);
+            JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, saleTeaMber, null, days);
             result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
             result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
 
@@ -168,11 +168,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));*/
 
         } else if ("2".equals(mediaId)) {
-            result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds, null);
+            result = baseMapper.queryKsTodayCharge(statDay, hour, saleTeaMber, null);
             //周消耗
-            weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds, null);
+            weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, saleTeaMber, null);
             //月消耗
-            String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds, null);
+            String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, saleTeaMber, null);
             result.put("weekCharge", new BigDecimal(weekCharge));
             result.put("monthCharge", new BigDecimal(monthCharge));
             //现金消耗 + 环比ROI
@@ -183,7 +183,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             if (!startTime.equals(statDay)) {
                 hour = 23;
             }
-            JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, accountIds, null, days);
+            JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, saleTeaMber, null, days);
             result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
             result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
                 /*result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
@@ -240,46 +240,34 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     @Override
     public Result<Object> getHomeCharges(String userId, String mediaId, String startTime, String endTime) throws ParseException {
         String roleCode = baseMapper.getRoleCodeByUserId(userId);
-
-        List<Long> compayAllAccountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, null);
-        if (Check.isNull(compayAllAccountIds)) {
-            return Result.error("未查询到账户!");
-        }
-
         JSONObject data = null;
         //销售总监
         if ("saleDirector".equals(roleCode) || "saleAm".equals(roleCode)) {
             //丁兆明特殊处理
             if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
                 if (startTime.equals(endTime)) {
-                    data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, null, startTime);
+                    data = getDailyCharges(null, null, userId, mediaId, null, startTime);
                 } else {
-                    data = getManyDaysCharges(null, compayAllAccountIds, userId, mediaId, null, startTime, endTime);
+                    data = getManyDaysCharges(null, null, userId, mediaId, null, startTime, endTime);
                 }
                 return Result.ok(data);
             }
             //查询销售总监及旗下的人员 集
             List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
             saleTeaMber.add(userId);
-            //账户集合
-            List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber, null);
-            if (Check.isNull(accountIds)) {
-                return Result.error("未查询到账户!");
-            }
             if (startTime.equals(endTime)) {
                 //消耗数据
-                data = getDailyCharges(compayAllAccountIds, accountIds, userId, mediaId, null, startTime);
+                data = getDailyCharges("all", saleTeaMber, userId, mediaId, null, startTime);
 
             } else {
-                data = getManyDaysCharges(compayAllAccountIds, accountIds, userId, mediaId, null, startTime, endTime);
-
+                data = getManyDaysCharges("all", saleTeaMber, userId, mediaId, null, startTime, endTime);
             }
             //分公司总经理
         } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
             if (startTime.equals(endTime)) {
-                data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, null, startTime);
+                data = getDailyCharges(null, null, userId, mediaId, null, startTime);
             } else {
-                data = getManyDaysCharges(null, compayAllAccountIds, userId, mediaId, null, startTime, endTime);
+                data = getManyDaysCharges(null, null, userId, mediaId, null, startTime, endTime);
             }
         } else {
             return Result.error("该用户角色权限不足!");
@@ -287,7 +275,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         return Result.ok(data);
     }
 
-    private JSONObject getManyDaysCharges(List<Long> compayAllAccountIds, List<Long> accountIds, String userId, String mediaId, String companyId, String startTime, String endTime) throws ParseException {
+    private JSONObject getManyDaysCharges(String type, List<String> saleTeaMber, String userId, String mediaId, String companyId, String startTime, String endTime) throws ParseException {
         Map<String, String> map = DateUtils.getStartEndTime(startTime, endTime);
 
         //下个周期的开始时间
@@ -299,28 +287,28 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         //1 头条
         if ("1".equals(mediaId)) {
             //查询 消耗 + 环比
-            result = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, accountIds, companyId);
-            List<JSONObject> list = baseMapper.queryTtManydaysCharge(startTime, endTime, accountIds, companyId);
+            result = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, saleTeaMber, companyId);
+            List<JSONObject> list = baseMapper.queryTtManydaysCharge(startTime, endTime, saleTeaMber, companyId);
             result.put("list", list);
             //平台消耗
-            if (compayAllAccountIds == null) {
+            if (type == null) {
                 result.put("platformCharge", result.getString("totalCharge"));
                 result.put("platformChargeRoi", result.getString("chargeRoi"));
             } else {
-                JSONObject ptdata = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds, companyId);
+                JSONObject ptdata = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, null, companyId);
                 result.put("platformCharge", ptdata.getString("totalCharge"));
                 result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
             }
         } else if ("2".equals(mediaId)) {
-            result = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, accountIds, companyId);
-            List<JSONObject> list = baseMapper.queryKsManydaysCharge(startTime, endTime, accountIds, companyId);
+            result = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, saleTeaMber, companyId);
+            List<JSONObject> list = baseMapper.queryKsManydaysCharge(startTime, endTime, saleTeaMber, companyId);
             result.put("list", list);
             //平台消耗
-            if (compayAllAccountIds == null) {
+            if (type == null) {
                 result.put("platformCharge", result.getString("totalCharge"));
                 result.put("platformChargeRoi", result.getString("chargeRoi"));
             } else {
-                JSONObject ptdata = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds, companyId);
+                JSONObject ptdata = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, null, companyId);
                 result.put("platformCharge", ptdata.getString("totalCharge"));
                 result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
             }
@@ -329,7 +317,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     }
 
 
-    private JSONObject getDailyCharges(List<Long> compayAllAccountIds, List<Long> accountIds, String userId, String mediaId, String companyId, String date) throws ParseException {
+    private JSONObject getDailyCharges(String type, List<String> saleTeaMber, String userId, String mediaId, String companyId, String date) throws ParseException {
         //当前小时数
         Integer hour = DateUtils.getHour(DateUtils.formatDateTime());
         if (!date.equals(DateUtils.date2Str())) {
@@ -339,28 +327,28 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         //1 头条
         if ("1".equals(mediaId)) {
             //查询当日消耗 + 环比
-            result = baseMapper.queryTtTodayCharge(date, hour, accountIds, companyId);
-            List<JSONObject> list = baseMapper.queryTtHourList(date, accountIds, companyId);
+            result = baseMapper.queryTtTodayCharge(date, hour, saleTeaMber, companyId);
+            List<JSONObject> list = baseMapper.queryTtHourList(date, saleTeaMber, companyId);
             result.put("list", list);
             //平台消耗
-            if (compayAllAccountIds == null) {
+            if (type == null) {
                 result.put("platformCharge", result.getString("totalCharge"));
                 result.put("platformChargeRoi", result.getString("chargeRoi"));
             } else {
-                JSONObject ptdata = baseMapper.queryTtTodayCharge(date, hour, compayAllAccountIds, companyId);
+                JSONObject ptdata = baseMapper.queryTtTodayCharge(date, hour, null, companyId);
                 result.put("platformCharge", ptdata.getString("totalCharge"));
                 result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
             }
         } else if ("2".equals(mediaId)) {
-            result = baseMapper.queryKsTodayCharge(date, hour, accountIds, companyId);
-            List<JSONObject> list = baseMapper.queryKsHourList(date, accountIds, companyId);
+            result = baseMapper.queryKsTodayCharge(date, hour, saleTeaMber, companyId);
+            List<JSONObject> list = baseMapper.queryKsHourList(date, saleTeaMber, companyId);
             result.put("list", list);
             //平台消耗
-            if (compayAllAccountIds == null) {
+            if (type == null) {
                 result.put("platformCharge", result.getString("totalCharge"));
                 result.put("platformChargeRoi", result.getString("chargeRoi"));
             } else {
-                JSONObject ptdata = baseMapper.queryKsTodayCharge(date, hour, compayAllAccountIds, companyId);
+                JSONObject ptdata = baseMapper.queryKsTodayCharge(date, hour, null, companyId);
                 result.put("platformCharge", ptdata.getString("totalCharge"));
                 result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
             }