ソースを参照

人效 初版

zhaoxian 3 年 前
コミット
2217e87eb3

+ 46 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/ReportController.java

@@ -100,12 +100,55 @@ public class ReportController {
      * @param mediaId
      * @param mediaId
      */
      */
     @GetMapping("/getProjectReport")
     @GetMapping("/getProjectReport")
-    public Result<Object> getProjectReport(String mediaId,String category, String sortCode, String order, Long projectId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+    public Result<Object> getProjectReport(String mediaId, String category, String sortCode, String order, Long projectId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
         try {
             if ("1".equals(mediaId)) {
             if ("1".equals(mediaId)) {
-                return bytedanceReportService.getProjectReport(category,projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
+                return bytedanceReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
             } else {
             } else {
-                return kuaishouReportService.getProjectReport(category,projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
+                return kuaishouReportService.getProjectReport(category, projectId, startTime, endTime, sortCode, order, pageSize, pageNo);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
+    }
+
+    /**
+     * 获取运营数据
+     *
+     * @param endTime
+     * @param startTime
+     * @param mediaId
+     */
+    @GetMapping("/getOperateInfo")
+    public Result<Object> getOperateInfo(String mediaId, String category, String sortCode, String order, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        try {
+            if ("1".equals(mediaId)) {
+                return bytedanceReportService.getOperateInfo(startTime, endTime);
+            } else {
+                return kuaishouReportService.getOperateInfo(startTime, endTime);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.error("查询失败");
+    }
+
+
+    /**
+     * 获取运营组数据
+     *
+     * @param endTime
+     * @param startTime
+     * @param mediaId
+     */
+    @GetMapping("/getOperateGroupInfo")
+    public Result<Object> getOperateGroupInfo(String mediaId, String startTime, String endTime) {
+        try {
+            if ("1".equals(mediaId)) {
+                return bytedanceReportService.getOperateGroupInfo(startTime, endTime);
+            } else {
+                return kuaishouReportService.getOperateGroupInfo(startTime, endTime);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();

+ 15 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/BytedanceAccountReportDailyDwMapper.java

@@ -2,9 +2,12 @@ package org.jeecg.ctop.material.mapper;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateVo;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Set;
 
 
 public interface BytedanceAccountReportDailyDwMapper {
 public interface BytedanceAccountReportDailyDwMapper {
 
 
@@ -31,4 +34,16 @@ public interface BytedanceAccountReportDailyDwMapper {
     List<JSONObject> getUnitNoByHours(@Param("startTime") Integer startTimeInt);
     List<JSONObject> getUnitNoByHours(@Param("startTime") Integer startTimeInt);
 
 
     List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
     List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
+
+
+    /*--------------------------------------------*/
+
+    List<JSONObject> getToutiaoOperateInfoHourly(@Param("hour") Integer hour, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") List<String>  operatorUserIds);
+
+    List<JSONObject> getToutiaoOperateInfo( @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") List<String>  operatorUserIds);
+
+    KuaiShouOperateGroupVo getToutiaoOperateGroupInfoHourly(@Param("hour") Integer hour, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") Set<String> operatorUserIds);
+
+    KuaiShouOperateGroupVo getToutiaoOperateGroupInfo(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") Set<String> operatorUserIds);
+
 }
 }

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

@@ -2,9 +2,12 @@ package org.jeecg.ctop.material.mapper;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateVo;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Set;
 
 
 public interface KuaishouAccountReportDailyDwMapper {
 public interface KuaishouAccountReportDailyDwMapper {
 
 
@@ -32,4 +35,13 @@ public interface KuaishouAccountReportDailyDwMapper {
 
 
     List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
     List<JSONObject> getUnitNoByDays(@Param("startTime") Integer startTimeInt, @Param("endTime") Integer endTimeInt);
 
 
+    /*--------------------------------------------*/
+
+    List<JSONObject> getKuaishouOperateInfoHourly(@Param("hour") Integer hour, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") List<String> operatorUserIds);
+
+    List<JSONObject> getKuaishouOperateInfo(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") List<String> operatorUserIds);
+
+    KuaiShouOperateGroupVo getKuaishouOperateGroupInfoHourly(@Param("hour") Integer hour, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") Set<String> operatorUserIds);
+
+    KuaiShouOperateGroupVo getKuaishouOperateGroupInfo(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("lastTimeEnd") Long lastTimeEnd, @Param("lastTimeStart") Long lastTimeStart, @Param("list") Set<String> operatorUserIds);
 }
 }

+ 61 - 44
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/MaterialStareMapper.java

@@ -3,7 +3,11 @@ package org.jeecg.ctop.material.mapper;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.ctop.material.entity.vo.*;
+import org.jeecg.ctop.material.entity.vo.KuaiShouAccountPieVo;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateAccountVo;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateProjectVo;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateVo;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -14,106 +18,119 @@ public interface MaterialStareMapper {
 
 
 
 
     String getRoleCodeByUserId(@Param("userId") String userId);
     String getRoleCodeByUserId(@Param("userId") String userId);
+
     Set<String> getCompanyAllUserId(@Param("companyId") String companyId);
     Set<String> getCompanyAllUserId(@Param("companyId") String companyId);
-    String getUserCompanyByUserId(@Param("userId")String userId);
-    Set<String> getAffiliateId(@Param("leaderId")String leaderId,@Param("companyId")String companyId);
-    Set<String> querySubordinateRecursive(@Param("companyId")String companyId,@Param("leaderIds")Set<String> leaderIds);
-    Set<String> getKuaiShouAllOperators(@Param("companyId")String companyId,@Param("startDate")Long start, @Param("endDate")Long endDate,@Param("userIds")Set<String> userIds);
-    //快手-在投项目数量
-    String getKuaiShouOperatorProjectNum(@Param("startDate")Long start, @Param("endDate")Long endDate,@Param("userIds")Set<String> userIds);
 
 
+    String getUserCompanyByUserId(@Param("userId") String userId);
+
+    Set<String> getAffiliateId(@Param("leaderId") String leaderId, @Param("companyId") String companyId);
+
+    Set<String> querySubordinateRecursive(@Param("companyId") String companyId, @Param("leaderIds") Set<String> leaderIds);
+
+    Set<String> getKuaiShouAllOperators(@Param("companyId") String companyId, @Param("startDate") Long start, @Param("endDate") Long endDate, @Param("userIds") Set<String> userIds);
+
+    //快手-在投项目数量
+    String getKuaiShouOperatorProjectNum(@Param("startDate") Long start, @Param("endDate") Long endDate, @Param("userIds") Set<String> userIds);
 
 
 
 
     // 快手 - 时报 查询
     // 快手 - 时报 查询
     List<Map> getKuaiShouCostHourlyByUserIdList(@Param("startDate") Long today, @Param("endDate") Long yesterday, @Param("list") Set<String> operatorUserIds);
     List<Map> getKuaiShouCostHourlyByUserIdList(@Param("startDate") Long today, @Param("endDate") Long yesterday, @Param("list") Set<String> operatorUserIds);
+
     //快手-查询时报 消耗 前5
     //快手-查询时报 消耗 前5
-    List<JSONObject> getKuaiShouCostByTop5HourList(@Param("startDate")Long start, @Param("endDate")Long endDate, @Param("list")Set<String> operatorUserIds);
+    List<JSONObject> getKuaiShouCostByTop5HourList(@Param("startDate") Long start, @Param("endDate") Long endDate, @Param("list") Set<String> operatorUserIds);
 
 
     //快手 -日报查询
     //快手 -日报查询
-    List<Map> getKuaiShouCostDailyByUserIdList(@Param("startDate")Long startDate, @Param("endDate")Long endDate, @Param("list")Set<String> operatorUserIds);
+    List<Map> getKuaiShouCostDailyByUserIdList(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("list") Set<String> operatorUserIds);
+
     //快手-查询日报 消耗 前5
     //快手-查询日报 消耗 前5
-    List<JSONObject> getKuaiShouCostByTop5DailyList(@Param("startDate")Long start, @Param("endDate")Long end, @Param("list")Set<String> operatorUserIds);
+    List<JSONObject> getKuaiShouCostByTop5DailyList(@Param("startDate") Long start, @Param("endDate") Long end, @Param("list") Set<String> operatorUserIds);
 
 
     //快手 时报总消耗
     //快手 时报总消耗
-    JSONObject getKuaiShouTotalCost(@Param("startDate")Long startDate,@Param("endDate")Long endDate, @Param("nowHour")int nowHour, @Param("list")Set<String> operatorUserIds);
+    JSONObject getKuaiShouTotalCost(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("nowHour") int nowHour, @Param("list") Set<String> operatorUserIds);
+
     //快手 日报总消耗
     //快手 日报总消耗
-    JSONObject getKuaiShouTotalCostDaily(@Param("startDate")Long startDate,@Param("endDate")Long endDate, @Param("list")Set<String> operatorUserIds);
+    JSONObject getKuaiShouTotalCostDaily(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("list") Set<String> operatorUserIds);
 
 
     //快手-查询账户数据信息
     //快手-查询账户数据信息
-    List<KuaiShouOperateVo> getKuaiShouOperateInfo(@Param("startDate")Long startDate, @Param("endDate")Long endDate, @Param("list")Set<String> operatorUserIds);
-    List<KuaiShouOperateVo> getKuaiShouOperateInfoHourly(@Param("startDate")Long startDate, @Param("endDate")Long endDate, @Param("list")Set<String> operatorUserIds);
+    List<KuaiShouOperateVo> getKuaiShouOperateInfo(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("list") Set<String> operatorUserIds);
+
+    List<KuaiShouOperateVo> getKuaiShouOperateInfoHourly(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("list") Set<String> operatorUserIds);
 
 
     //查看 快手 有效 计划 组
     //查看 快手 有效 计划 组
-    JSONObject getKuaiShouAccountBaseByUserId(@Param("list")Set<String> operatorUserIds,@Param("projectId")String projectId,@Param("accountId")String accountId,@Param("startDate")Long startDate, @Param("endDate")Long endDate);
+    JSONObject getKuaiShouAccountBaseByUserId(@Param("list") Set<String> operatorUserIds, @Param("projectId") String projectId, @Param("accountId") String accountId, @Param("startDate") Long startDate, @Param("endDate") Long endDate);
+
     //查看 快手  当天数据 有效 计划 组
     //查看 快手  当天数据 有效 计划 组
-    JSONObject getKuaiShouAccountNowBaseByUserId(@Param("list")Set<String> operatorUserIds,@Param("projectId")String projectId,@Param("accountId")String accountId,@Param("startDate")Long startDate, @Param("endDate")Long endDate);
+    JSONObject getKuaiShouAccountNowBaseByUserId(@Param("list") Set<String> operatorUserIds, @Param("projectId") String projectId, @Param("accountId") String accountId, @Param("startDate") Long startDate, @Param("endDate") Long endDate);
+
     //查看 上传到助手、媒体的素材数量 分版位花费
     //查看 上传到助手、媒体的素材数量 分版位花费
-    List<JSONObject> getKuaiShouMaterailUploadType(@Param("projectId")String projectId,@Param("startDate")Long startDate, @Param("endDate")Long endDate);
+    List<JSONObject> getKuaiShouMaterailUploadType(@Param("projectId") String projectId, @Param("startDate") Long startDate, @Param("endDate") Long endDate);
+
     //查看 快手 分版位花费
     //查看 快手 分版位花费
-    List<JSONObject> getKuaiShouAdSceneData(@Param("projectId")String projectId,@Param("startDate")Long startDate, @Param("endDate")Long endDate);
+    List<JSONObject> getKuaiShouAdSceneData(@Param("projectId") String projectId, @Param("startDate") Long startDate, @Param("endDate") Long endDate);
 
 
     //快手 -查询 项目 数据信息
     //快手 -查询 项目 数据信息
-    List<KuaiShouOperateProjectVo> getKuaiShouOperateProjectInfo(@Param("startDate")Long startDate, @Param("endDate")Long endDate, @Param("projectId")String projectId,@Param("list")Set<String> operatorUserIds);
+    List<KuaiShouOperateProjectVo> getKuaiShouOperateProjectInfo(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("projectId") String projectId, @Param("list") Set<String> operatorUserIds);
 
 
     //快手 -查询 账户 数据信息
     //快手 -查询 账户 数据信息
-    List<KuaiShouOperateAccountVo> getKuaiShouOperateAccountInfo(@Param("startDate")Long startDate, @Param("endDate")Long endDate, @Param("projectId")String projectId,@Param("accountId")Long accountId, @Param("list")Set<String> operatorUserIds);
-
+    List<KuaiShouOperateAccountVo> getKuaiShouOperateAccountInfo(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("projectId") String projectId, @Param("accountId") Long accountId, @Param("list") Set<String> operatorUserIds);
 
 
 
 
     //快手 账户 余额
     //快手 账户 余额
-    JSONObject getKuaiShouAccountBalance(@Param("accountId")Long accountId);
+    JSONObject getKuaiShouAccountBalance(@Param("accountId") Long accountId);
+
     //快手 账户 消耗以及状态
     //快手 账户 消耗以及状态
-    JSONObject getKuaiShouAccountTotalCost(@Param("accountId")Long accountId,@Param("statDate")Long statDate);
+    JSONObject getKuaiShouAccountTotalCost(@Param("accountId") Long accountId, @Param("statDate") Long statDate);
+
     //快手-运营 月总消耗
     //快手-运营 月总消耗
-    JSONObject getKuaiShouAccountCostMonth(@Param("userId")String userId,@Param("statDate")Long statDate,@Param("endDate")Long endDate);
-    JSONObject getKuaiShouUserByUserId(@Param("userId")String userId);
+    JSONObject getKuaiShouAccountCostMonth(@Param("userId") String userId, @Param("statDate") Long statDate, @Param("endDate") Long endDate);
+
+    JSONObject getKuaiShouUserByUserId(@Param("userId") String userId);
 
 
     //快手 账户趋势图-时报
     //快手 账户趋势图-时报
-    List<JSONObject> getKuaiShouAccountInfoBrokenLineHour(@Param("type")String type,@Param("accountId")Long accountId,@Param("statDate")Long statDate,@Param("endDate")Long endDate);
+    List<JSONObject> getKuaiShouAccountInfoBrokenLineHour(@Param("type") String type, @Param("accountId") Long accountId, @Param("statDate") Long statDate, @Param("endDate") Long endDate);
+
     //快手 账户趋势图-日报
     //快手 账户趋势图-日报
-    List<JSONObject> getKuaiShouAccountInfoBrokenLineDaily(@Param("type")String type,@Param("accountId")Long accountId,@Param("startDate")Long startDate, @Param("endDate")Long endDate);
+    List<JSONObject> getKuaiShouAccountInfoBrokenLineDaily(@Param("type") String type, @Param("accountId") Long accountId, @Param("startDate") Long startDate, @Param("endDate") Long endDate);
 
 
     //快手 账户 素材上新-有效-爆款   searchType: 0-全部 1-上新 2-有效 3-爆款
     //快手 账户 素材上新-有效-爆款   searchType: 0-全部 1-上新 2-有效 3-爆款
-    List<JSONObject> getKuaiShouAccountMaterialNewAndEffectAndFaddish(@Param("accountId")Long accountId,@Param("searchType")String searchType,@Param("startDate")Long startDate, @Param("endDate")Long endDate);
+    List<JSONObject> getKuaiShouAccountMaterialNewAndEffectAndFaddish(@Param("accountId") Long accountId, @Param("searchType") String searchType, @Param("startDate") Long startDate, @Param("endDate") Long endDate);
 
 
 
 
     //快手 账户饼图图-分版位
     //快手 账户饼图图-分版位
-    List<KuaiShouAccountPieVo> getKuaiShouAccountPieScene(@Param("accountId")Long accountId, @Param("startDate")Long startDate, @Param("endDate")Long endDate,@Param("type")String type);
+    List<KuaiShouAccountPieVo> getKuaiShouAccountPieScene(@Param("accountId") Long accountId, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("type") String type);
+
     //快手 账户饼图图-分年龄
     //快手 账户饼图图-分年龄
-    List<KuaiShouAccountPieVo> getKuaiShouAccountPieAge(@Param("accountId")Long accountId, @Param("startDate")Long startDate, @Param("endDate")Long endDate,@Param("type")String type);
+    List<KuaiShouAccountPieVo> getKuaiShouAccountPieAge(@Param("accountId") Long accountId, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("type") String type);
+
     //快手 账户饼图图-分性别
     //快手 账户饼图图-分性别
-    List<KuaiShouAccountPieVo> getKuaiShouAccountPieGender(@Param("accountId")Long accountId, @Param("startDate")Long startDate, @Param("endDate")Long endDate,@Param("type")String type);
+    List<KuaiShouAccountPieVo> getKuaiShouAccountPieGender(@Param("accountId") Long accountId, @Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("type") String type);
 
 
     //快手组实时数据查询-当天创建的组+当天有消耗的组
     //快手组实时数据查询-当天创建的组+当天有消耗的组
-    List<JSONObject> kuaiShouRealTimeUnitDateInfo(@Param("accountId")Long accountId, @Param("nowDate")Long nowDate);
+    List<JSONObject> kuaiShouRealTimeUnitDateInfo(@Param("accountId") Long accountId, @Param("nowDate") Long nowDate);
 
 
 
 
     //快手 账户 框返 激励 消耗
     //快手 账户 框返 激励 消耗
-    JSONObject getKuaiShouAccountCharged(@Param("startDate")Long startDate, @Param("endDate")Long endDate,@Param("list")Set<String> operatorUserIds);
+    JSONObject getKuaiShouAccountCharged(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("list") Set<String> operatorUserIds);
 
 
     //快手 运营 组内消耗 排名
     //快手 运营 组内消耗 排名
-    List<JSONObject> getKuaiShouPersonalGroupRank(@Param("startDate")Long startDate, @Param("endDate")Long endDate,@Param("companyId")String companyId);
-
-
-
-
-
+    List<JSONObject> getKuaiShouPersonalGroupRank(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("companyId") String companyId);
 
 
 
 
     List<JSONObject> getProjectByUserIdAndMediaIdsSubordinate(@Param("userIds") Set<String> userIds, @Param("mediaIds") List<Integer> mediaIds);
     List<JSONObject> getProjectByUserIdAndMediaIdsSubordinate(@Param("userIds") Set<String> userIds, @Param("mediaIds") List<Integer> mediaIds);
-    List<JSONObject> getAccountListByProjectListSubordinate(@Param("userIds") Set<String> userIds,@Param("list") List list);
-
-
 
 
+    List<JSONObject> getAccountListByProjectListSubordinate(@Param("userIds") Set<String> userIds, @Param("list") List list);
 
 
 
 
-    JSONObject getColumnInfo(@Param("userId") String userId,@Param("columnType") String columnType);
+    JSONObject getColumnInfo(@Param("userId") String userId, @Param("columnType") String columnType);
 
 
     /**
     /**
      * 查询运营经理角色的人
      * 查询运营经理角色的人
+     *
      * @return
      * @return
      */
      */
-    List<KuaiShouOperateGroupVo> getOperationManagerUser();
+    List<KuaiShouOperateGroupVo> getOperationManagerUser(@Param("roleCode") String roleCode);
 
 
+    Set<String> queryOperateTeamMember(@Param("userId") String userId);
 
 
+    List<String> getAllOperationByMediaId(@Param("mediaId") String mediaId);
 }
 }

+ 243 - 0
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/BytedanceAccountReportDailyDwMapper.xml

@@ -324,4 +324,247 @@
         ORDER BY stat_date
         ORDER BY stat_date
     </select>
     </select>
 
 
+
+    <select id="getToutiaoOperateInfoHourly" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT COUNT(DISTINCT t.account_id) 'accountNum',
+        COUNT(DISTINCT t.project_id) 'projectNum',
+        SUM(t.cost) 'totalCost',
+        t.user_id as 'userId',
+        t2.realname as 'userName' ,
+        CONCAT(CAST(IFNULL(ROUND((SUM(t.cost) - t3.lastCost) / t3.lastCost * 100, 2), 0) AS CHAR), '%') AS 'rate',
+        '-' as 'newUnitNum',
+        '-' as 'newCampaignNum'
+        FROM `application`.bytedance_advertiser_report_hourly_dw t
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation t1 ON t.account_id = t1.account_id
+        LEFT JOIN `jeecg-boot`.sys_user t2 ON t.user_id = t2.id
+        LEFT JOIN (
+        SELECT SUM(d.cost) as 'lastCost', d.user_id
+        FROM `application`.bytedance_advertiser_report_hourly_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE d.cost > 0
+        AND u.account_status = 0
+        AND hour &lt;= #{hour}
+        AND d.stat_datetime >= #{lastTimeStart}
+        AND d.stat_datetime &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY t.user_id
+        GROUP BY d.user_id
+        ) t3 ON t.user_id = t3.user_id
+        WHERE t.cost > 0
+        AND t1.account_status = 0
+        AND hour &lt;= #{hour}
+        AND t.stat_datetime >= #{startDate}
+        AND t.stat_datetime &lt;= #{endDate}
+        <if test='list!=null'>
+            AND t.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY t.user_id
+        ORDER BY SUM(t.cost) DESC
+    </select>
+
+    <select id="getToutiaoOperateInfo" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT COUNT(DISTINCT t.account_id) 'accountNum',
+        COUNT(DISTINCT t.project_id) 'projectNum',
+        SUM(t.cost) 'totalCost',
+        t.user_id as 'userId',
+        t2.realname as 'userName' ,
+        CONCAT(CAST(IFNULL(ROUND((SUM(t.cost) - t3.lastCost) / t3.lastCost * 100, 2), 0) AS CHAR), '%') AS 'rate',
+        IFNULL(t4.newUnitNum,'-') as 'newUnitNum',
+        IFNULL(t4.newCampaignNum,'-') as 'newCampaignNum'
+        FROM `application`.bytedance_advertiser_report_daily_dw t
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation t1 ON t.account_id = t1.account_id
+        LEFT JOIN `jeecg-boot`.sys_user t2 ON t.user_id = t2.id
+        LEFT JOIN (
+        SELECT SUM(d.cost) as 'lastCost', d.user_id
+        FROM `application`.bytedance_advertiser_report_daily_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE d.cost > 0
+        AND u.account_status = 0
+        AND d.stat_datetime >= #{lastTimeStart}
+        AND d.stat_datetime &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY d.user_id
+        ) t3 ON t.user_id = t3.user_id
+        LEFT JOIN (
+        SELECT user_id,
+        SUM(new_ad_num) as 'newUnitNum',
+        SUM(new_campaign_num) as 'newCampaignNum'
+        FROM application.app_bytedance_account_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>
+        GROUP BY user_id
+        ) t4 ON t.user_id = t4.user_id
+        WHERE t.cost > 0
+        AND t1.account_status = 0
+        AND t.stat_datetime >= #{startDate}
+        AND t.stat_datetime &lt;= #{endDate}
+        <if test='list!=null'>
+            AND t.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY t.user_id
+        ORDER BY SUM(t.cost) DESC
+    </select>
+
+
+    <select id="getToutiaoOperateGroupInfoHourly" resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo">
+        SELECT
+        IFNULL( count( t1.user_id ), 0 ) AS 'operationNum',
+        IFNULL( SUM( t1.accountNum ), 0 ) AS 'accountNum',
+        IFNULL( SUM( t1.projectNum ), 0 ) AS 'projectNum',
+        IFNULL( SUM( t1.totalCost ), 0 ) AS 'totalCost',
+        t3.lastCost,
+        CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
+        AS 'yearOnYearCost',
+        '-' as 'unitNum'
+        FROM
+        (
+        SELECT
+        COUNT( DISTINCT d.account_id ) 'accountNum',
+        COUNT( DISTINCT d.project_id ) 'projectNum',
+        SUM( d.cost ) 'totalCost' ,
+        d.user_id
+        FROM
+        `application`.bytedance_advertiser_report_hourly_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.cost > 0
+        AND u.account_status = 0
+        AND d.hour &lt;= #{hour}
+        AND d.stat_datetime >= #{startDate}
+        AND d.stat_datetime &lt;=#{endDate}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        d.user_id
+        ) t1
+        LEFT JOIN (
+        SELECT
+        SUM(d.cost) 'lastCost'
+        FROM
+        `application`.bytedance_advertiser_report_hourly_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.cost > 0
+        AND u.account_status = 0
+        AND d.hour &lt;= #{hour}
+        AND d.stat_datetime >= #{lastTimeStart}
+        AND d.stat_datetime &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) t3 ON 1 = 1
+
+    </select>
+
+    <select id="getToutiaoOperateGroupInfo" resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo">
+        SELECT
+        IFNULL( count( t1.user_id ), 0 ) AS 'operationNum',
+        IFNULL( SUM( t1.accountNum ), 0 ) AS 'accountNum',
+        IFNULL( SUM( t1.projectNum ), 0 ) AS 'projectNum',
+        IFNULL( SUM( t1.totalCost ), 0 ) AS 'totalCost',
+        t3.lastCost,
+        CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
+        AS 'yearOnYearCost',
+        t4.unitNum
+        FROM
+        (
+        SELECT
+        COUNT( DISTINCT d.account_id ) 'accountNum',
+        COUNT( DISTINCT d.project_id ) 'projectNum',
+        SUM( d.cost ) 'totalCost' ,
+        d.user_id
+        FROM
+        `application`.bytedance_advertiser_report_daily_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.cost > 0
+        AND u.account_status = 0
+        AND d.stat_datetime >= #{startDate}
+        AND d.stat_datetime &lt;=#{endDate}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        d.user_id
+        ) t1
+        LEFT JOIN (
+        SELECT
+        SUM(d.cost) 'lastCost'
+        FROM
+        `application`.bytedance_advertiser_report_daily_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.cost > 0
+        AND u.account_status = 0
+        AND d.stat_datetime >= #{lastTimeStart}
+        AND d.stat_datetime &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) t3 ON 1 = 1
+        LEFT JOIN (
+        SELECT IFNULL(SUM(new_ad_num),'-') as 'unitNum'
+        FROM application.app_bytedance_account_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>
+
 </mapper>
 </mapper>

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

@@ -362,4 +362,264 @@
         ORDER BY stat_date
         ORDER BY stat_date
     </select>
     </select>
 
 
+
+    <select id="getKuaishouOperateInfoHourly" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT COUNT(DISTINCT t.account_id) 'accountNum',
+        COUNT(DISTINCT t.project_id) 'projectNum',
+        SUM(t.charge) 'totalCost',
+        t.user_id,
+        t2.realname as 'userName' ,
+        CONCAT(CAST(IFNULL(ROUND((SUM(t.charge) - t3.lastCost) / t3.lastCost * 100, 2), 0) AS CHAR), '%') AS 'rate',
+        IFNULL(t4.newUnitNum,'-') as 'newUnitNum',
+        '-' as 'newCampaignNum'
+        FROM `application`.kuaishou_account_report_hourly_dw t
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation t1 ON t.account_id = t1.account_id
+        LEFT JOIN `jeecg-boot`.sys_user t2 ON t.user_id = t2.id
+        LEFT JOIN (
+        SELECT SUM(d.charge) as 'lastCost', d.user_id
+        FROM `application`.kuaishou_account_report_hourly_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE d.charge > 0
+        AND u.account_status = 0
+        AND hour &lt;= #{hour}
+        AND d.stat_date >= #{lastTimeStart}
+        AND d.stat_date &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY t.user_id
+        GROUP BY d.user_id
+        ) t3 ON t.user_id = t3.user_id
+        LEFT JOIN (
+        SELECT
+        user_id,
+        SUM(new_all_unit_num) as 'newUnitNum'
+        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>
+        group by user_id
+        ) t4 ON t.user_id = t4.user_id
+        WHERE t.charge > 0
+        AND t1.account_status = 0
+        AND hour &lt;= #{hour}
+        AND t.stat_date >= #{startDate}
+        AND t.stat_date &lt;= #{endDate}
+        <if test='list!=null'>
+            AND t.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY t.user_id
+        ORDER BY SUM(t.charge) DESC
+    </select>
+
+    <select id="getKuaishouOperateInfo" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT COUNT(DISTINCT t.account_id) 'accountNum',
+        COUNT(DISTINCT t.project_id) 'projectNum',
+        SUM(t.charge) 'totalCost',
+        t.user_id,
+        t2.realname as 'userName' ,
+        CONCAT(CAST(IFNULL(ROUND((SUM(t.charge) - t3.lastCost) / t3.lastCost * 100, 2), 0) AS CHAR), '%') AS 'rate',
+        IFNULL(t4.newUnitNum,'-') as 'newUnitNum',
+        IFNULL(t4.newCampaignNum,'-') as 'newCampaignNum'
+        FROM `application`.kuaishou_account_report_daily_dw t
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation t1 ON t.account_id = t1.account_id
+        LEFT JOIN `jeecg-boot`.sys_user t2 ON t.user_id = t2.id
+        LEFT JOIN (
+        SELECT SUM(d.charge) as 'lastCost', d.user_id
+        FROM `application`.kuaishou_account_report_daily_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE d.charge > 0
+        AND u.account_status = 0
+        AND d.stat_date >= #{lastTimeStart}
+        AND d.stat_date &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY d.user_id
+        ) t3 ON t.user_id = t3.user_id
+        LEFT JOIN (
+        SELECT
+        user_id,
+        SUM(new_campaign_num) as 'newCampaignNum',
+        SUM(new_unit_num) as 'newUnitNum'
+        FROM application.app_kuaishou_account_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>
+        group by user_id
+        ) t4 ON t.user_id = t4.user_id
+        WHERE t.charge > 0
+        AND t1.account_status = 0
+        AND t.stat_date >= #{startDate}
+        AND t.stat_date &lt;= #{endDate}
+        <if test='list!=null'>
+            AND t.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY t.user_id
+        ORDER BY SUM(t.charge) DESC
+    </select>
+
+    <select id="getKuaishouOperateGroupInfoHourly"
+            resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo">
+        SELECT
+        IFNULL( count( t1.user_id ), 0 ) AS 'operationNum',
+        IFNULL( SUM( t1.accountNum ), 0 ) AS 'accountNum',
+        IFNULL( SUM( t1.projectNum ), 0 ) AS 'projectNum',
+        IFNULL( SUM( t1.totalCost ), 0 ) AS 'totalCost',
+        t3.lastCost,
+        CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
+        AS 'yearOnYearCost',
+        '-' as 'unitNum'
+        FROM
+        (
+        SELECT
+        COUNT( DISTINCT d.account_id ) 'accountNum',
+        COUNT( DISTINCT d.project_id ) 'projectNum',
+        SUM( d.charge ) 'totalCost' ,
+        d.user_id
+        FROM
+        `application`.kuaishou_account_report_hourly_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.charge > 0
+        AND u.account_status = 0
+        AND d.hour &lt;= #{hour}
+        AND d.stat_date >= #{startDate}
+        AND d.stat_date &lt;=#{endDate}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        d.user_id
+        ) t1
+        LEFT JOIN (
+        SELECT
+        SUM(d.charge) 'lastCost'
+        FROM
+        `application`.kuaishou_account_report_hourly_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.charge > 0
+        AND u.account_status = 0
+        AND d.hour &lt;= #{hour}
+        AND d.stat_date >= #{lastTimeStart}
+        AND d.stat_date &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) t3 ON 1 = 1
+
+    </select>
+
+    <select id="getKuaishouOperateGroupInfo" resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo">
+        SELECT
+        IFNULL( count( t1.user_id ), 0 ) AS 'operationNum',
+        IFNULL( SUM( t1.accountNum ), 0 ) AS 'accountNum',
+        IFNULL( SUM( t1.projectNum ), 0 ) AS 'projectNum',
+        IFNULL( SUM( t1.totalCost ), 0 ) AS 'totalCost',
+        t3.lastCost,
+        CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
+        AS 'yearOnYearCost',
+        t4.unitNum
+        FROM
+        (
+        SELECT
+        COUNT( DISTINCT d.account_id ) 'accountNum',
+        COUNT( DISTINCT d.project_id ) 'projectNum',
+        SUM( d.charge ) 'totalCost' ,
+        d.user_id
+        FROM
+        `application`.kuaishou_account_report_daily_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.charge > 0
+        AND u.account_status = 0
+        AND d.stat_date >= #{startDate}
+        AND d.stat_date &lt;=#{endDate}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        d.user_id
+        ) t1
+        LEFT JOIN (
+        SELECT
+        SUM(d.charge) 'lastCost'
+        FROM
+        `application`.kuaishou_account_report_daily_dw d
+        LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
+        LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
+        WHERE
+        d.charge > 0
+        AND u.account_status = 0
+        AND d.stat_date >= #{lastTimeStart}
+        AND d.stat_date &lt;= #{lastTimeEnd}
+        <if test='list!=null'>
+            AND d.user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </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>
+
 </mapper>
 </mapper>

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

@@ -1326,7 +1326,6 @@
 
 
     <!-- 查询运营经理角色的人员 -->
     <!-- 查询运营经理角色的人员 -->
     <select id="getOperationManagerUser" resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo">
     <select id="getOperationManagerUser" resultType="org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo">
-
         SELECT
         SELECT
             u.id as userId,
             u.id as userId,
             u.username,
             u.username,
@@ -1337,14 +1336,42 @@
             `jeecg-boot`.sys_role r,
             `jeecg-boot`.sys_role r,
             `jeecg-boot`.sys_user_role sur
             `jeecg-boot`.sys_user_role sur
         WHERE
         WHERE
-            r.role_code LIKE '%OperationManager%'
+            r.role_code = #{roleCode}
           AND u.id = sur.user_id
           AND u.id = sur.user_id
           AND r.id = sur.role_id
           AND r.id = sur.role_id
           AND u.STATUS = 1
           AND u.STATUS = 1
           AND u.del_flag = 0
           AND u.del_flag = 0
         ORDER BY u.create_time
         ORDER BY u.create_time
+    </select>
+
 
 
+    <select id="queryOperateTeamMember" resultType="String">
+        select
+            u.id
+        from
+            `jeecg-boot`.sys_user u
+            LEFT JOIN `application`.app_user_manage m ON u.id = m.user_id
+            LEFT JOIN `jeecg-boot`.sys_user_role ur ON u.id = ur.user_id
+            LEFT JOIN `jeecg-boot`.sys_role r ON ur.role_id = r.id
+        where m.manage_id = #{userId}
+          AND   r.role_name LIKE '%运营%'
+          AND u.STATUS = 1
+          AND u.del_flag = 0
+        ORDER BY m.user_name
     </select>
     </select>
 
 
+    <select id="getAllOperationByMediaId" resultType="String">
+        select DISTINCT t.user_id FROM `jeecg-boot`.user_company t
+                                           LEFT JOIN `jeecg-boot`.sys_user_role t1 ON t.user_id = t1.user_id
+                                           LEFT JOIN `jeecg-boot`.sys_role t2 ON t1.role_id = t2.id
+                                           LEFT JOIN `jeecg-boot`.sys_user t3 ON t.user_id = t3.id
+                                           LEFT JOIN  `jeecg-boot`.ctop_user_allocation t4 ON t.user_id = t4.user_id
+        WHERE  t2.role_name LIKE '%运营%'
+          AND t.company_id = 'd57fecdcf7a94d009736d9c850731582'
+          AND t3.STATUS = 1
+          AND t3.del_flag = 0
+          AND t4.media_id = #{mediaId}
+
+    </select>
 
 
 </mapper>
 </mapper>

+ 5 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IBytedanceAccountReportDailyDwService.java

@@ -11,5 +11,9 @@ public interface IBytedanceAccountReportDailyDwService {
 
 
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
     JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
 
 
-    Result<Object> getProjectReport(String category,Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+
+    Result<Object> getOperateInfo(String startTime, String endTime);
+
+    Result<Object> getOperateGroupInfo(String startTime, String endTime);
 }
 }

+ 6 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IKuaishouAccountReportDailyDwService.java

@@ -9,7 +9,11 @@ public interface IKuaishouAccountReportDailyDwService {
 
 
     JSONObject getTotalCharge(Map<String, Object> paramsMap);
     JSONObject getTotalCharge(Map<String, Object> paramsMap);
 
 
-    JSONObject getTrendCharge(String type,Long projectId, String startTime, String endTime);
+    JSONObject getTrendCharge(String type, Long projectId, String startTime, String endTime);
 
 
-    Result<Object> getProjectReport(String category,Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+    Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception;
+
+    Result<Object> getOperateInfo(String startTime, String endTime);
+
+    Result<Object> getOperateGroupInfo(String startTime, String endTime);
 }
 }

+ 118 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/BytedanceAccountReportDailyDwServiceImpl.java

@@ -5,14 +5,21 @@ import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.ctop.material.constants.Check;
 import org.jeecg.ctop.material.constants.Check;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo;
 import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
 import org.jeecg.ctop.material.mapper.BytedanceAccountReportDailyDwMapper;
+import org.jeecg.ctop.material.mapper.MaterialStareMapper;
 import org.jeecg.ctop.material.service.IBytedanceAccountReportDailyDwService;
 import org.jeecg.ctop.material.service.IBytedanceAccountReportDailyDwService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Set;
 
 
 @Service
 @Service
 public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccountReportDailyDwService {
 public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccountReportDailyDwService {
@@ -20,6 +27,9 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
     @Resource
     @Resource
     private BytedanceAccountReportDailyDwMapper bytedanceAccountReportDailyDwMapper;
     private BytedanceAccountReportDailyDwMapper bytedanceAccountReportDailyDwMapper;
 
 
+    @Resource
+    private MaterialStareMapper materialStareMapper;
+
     @Override
     @Override
     public JSONObject getTotalCharge(Map<String, Object> paramsMap) {
     public JSONObject getTotalCharge(Map<String, Object> paramsMap) {
         JSONObject by = bytedanceAccountReportDailyDwMapper.getTotalCharge(paramsMap);
         JSONObject by = bytedanceAccountReportDailyDwMapper.getTotalCharge(paramsMap);
@@ -103,11 +113,11 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
         if (startTime.equals(endTime) && today.equals(startTime)) {
         if (startTime.equals(endTime) && today.equals(startTime)) {
 //            total = bytedanceAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            total = bytedanceAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
-            data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour,sortCode, order);
+            data = bytedanceAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour, sortCode, order);
         } else {
         } else {
 //            total = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            total = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
-            data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour,sortCode, order);
+            data = bytedanceAccountReportDailyDwMapper.getProjectMoreDaysReport(projectId, startTimeInt, endTimeInt, nowHour, sortCode, order);
         }
         }
         PageInfo<JSONObject> page = new PageInfo<>();
         PageInfo<JSONObject> page = new PageInfo<>();
         page.setList(data);
         page.setList(data);
@@ -115,4 +125,110 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
         return Result.OK(page);
         return Result.OK(page);
     }
     }
 
 
+    @Override
+    public Result<Object> getOperateInfo(String startTime, String endTime) {
+        try {
+            //当前小时
+            Integer hour = DateUtils.getNowHour();
+            //当天日期
+            Long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.formatDate(new Date())));
+
+            Long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
+            Long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
+
+            //开始日期前一天
+            String lastDay = DateUtils.getLastDay(startTime, 1);
+            //相差天数,同一天为 0
+            int days = DateUtils.dateDiff(startTime, endTime);
+            //上阶段时间
+            Long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastDay));
+            Long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(DateUtils.getLastDay(lastDay, days)));
+
+            List<String> userIds = materialStareMapper.getAllOperationByMediaId("1");
+            List<JSONObject> list = new ArrayList<>();
+            if (startDate == entDate && nowDate == startDate) {
+                list = bytedanceAccountReportDailyDwMapper.getToutiaoOperateInfoHourly(hour, startDate, entDate, lastTimeEnd, lastTimeStart, userIds);
+            } else {
+                list = bytedanceAccountReportDailyDwMapper.getToutiaoOperateInfo(startDate, entDate, lastTimeEnd, lastTimeStart, userIds);
+            }
+            PageInfo<JSONObject> pageInfo = new PageInfo<>(list);
+            return Result.successMsg("查询成功。", pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.errorMsg("查询失败了。");
+    }
+
+    @Override
+    public Result<Object> getOperateGroupInfo(String startTime, String endTime) {
+        try {
+            //当前小时
+            Integer hour = DateUtils.getNowHour();
+            //当天日期
+            Long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.formatDate(new Date())));
+
+            Long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
+            Long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
+
+            //开始日期前一天
+            String lastDay = DateUtils.getLastDay(startTime, 1);
+            //相差天数,同一天为 0
+            int days = DateUtils.dateDiff(startTime, endTime);
+            //上阶段时间
+            Long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastDay));
+            Long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(DateUtils.getLastDay(lastDay, days)));
+
+            List<KuaiShouOperateGroupVo> operationManagerList = materialStareMapper.getOperationManagerUser("touTiaoOperationManager");
+            List<KuaiShouOperateGroupVo> list = new ArrayList<>();
+            for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
+                //下级员工
+                Set<String> operatorUserIds = materialStareMapper.queryOperateTeamMember(groupVo.getUserId());
+                operatorUserIds.add(groupVo.getUserId());
+                //运营数量
+                int operationNum = operatorUserIds.size();
+                //查询账户数据
+                KuaiShouOperateGroupVo vo = new KuaiShouOperateGroupVo();
+                if (startDate == entDate && nowDate == startDate) {
+                    //时报
+                    vo = bytedanceAccountReportDailyDwMapper.getToutiaoOperateGroupInfoHourly(hour, startDate, entDate, lastTimeEnd, lastTimeStart, operatorUserIds);
+                } else {
+                    vo = bytedanceAccountReportDailyDwMapper.getToutiaoOperateGroupInfo(startDate, entDate, lastTimeEnd, lastTimeStart, operatorUserIds);
+                }
+                if (Check.isNull(vo.getTotalCost())) {
+                    continue;
+                }
+                vo.setUserId(groupVo.getUserId());
+                vo.setRealname(groupVo.getRealname());
+                vo.setOperationNum(operationNum);
+                //总花费
+                Double totalCost = vo.getTotalCost();
+                //日均消耗 总花费/天数
+                Double aveDay = totalCost / (days + 1);
+                vo.setAverageDayCost(new BigDecimal(aveDay).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+                //人均消耗
+                Double avePeople = totalCost / operationNum;
+                vo.setAveragePeopleCost(new BigDecimal(avePeople).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+                //账户数量
+                long accountNum = vo.getAccountNum();
+                //平均账户消耗 总花费/账户数量
+                Double aveAccount = accountNum == 0 ? 0 : totalCost / accountNum;
+                vo.setAverageAccountCost(new BigDecimal(aveAccount).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+                list.add(vo);
+            }
+            if (!Check.isNull(list)) {
+                Collections.sort(list, new Comparator<KuaiShouOperateGroupVo>() {
+                    @Override
+                    public int compare(KuaiShouOperateGroupVo o1, KuaiShouOperateGroupVo o2) {
+                        return o2.getTotalCost().compareTo(o1.getTotalCost());
+                    }
+                });
+            }
+            PageInfo<KuaiShouOperateGroupVo> pageInfo = new PageInfo<>(list);
+            return Result.successMsg("查询成功。", pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.errorMsg("查询失败了。");
+    }
+
 }
 }

+ 117 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/KuaishouAccountReportDailyDwServiceImpl.java

@@ -5,20 +5,30 @@ import com.github.pagehelper.PageInfo;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.ctop.material.constants.Check;
 import org.jeecg.ctop.material.constants.Check;
+import org.jeecg.ctop.material.entity.vo.KuaiShouOperateGroupVo;
 import org.jeecg.ctop.material.mapper.KuaishouAccountReportDailyDwMapper;
 import org.jeecg.ctop.material.mapper.KuaishouAccountReportDailyDwMapper;
+import org.jeecg.ctop.material.mapper.MaterialStareMapper;
 import org.jeecg.ctop.material.service.IKuaishouAccountReportDailyDwService;
 import org.jeecg.ctop.material.service.IKuaishouAccountReportDailyDwService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
+import java.util.Set;
 
 
 @Service
 @Service
 public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccountReportDailyDwService {
 public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccountReportDailyDwService {
     @Resource
     @Resource
     private KuaishouAccountReportDailyDwMapper kuaishouAccountReportDailyDwMapper;
     private KuaishouAccountReportDailyDwMapper kuaishouAccountReportDailyDwMapper;
 
 
+    @Resource
+    private MaterialStareMapper materialStareMapper;
+
     @Override
     @Override
     public JSONObject getTotalCharge(Map<String, Object> paramsMap) {
     public JSONObject getTotalCharge(Map<String, Object> paramsMap) {
         JSONObject ks = kuaishouAccountReportDailyDwMapper.getTotalCharge(paramsMap);
         JSONObject ks = kuaishouAccountReportDailyDwMapper.getTotalCharge(paramsMap);
@@ -84,7 +94,7 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
     }
     }
 
 
     @Override
     @Override
-    public Result<Object> getProjectReport(String category,Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
+    public Result<Object> getProjectReport(String category, Long projectId, String startTime, String endTime, String sortCode, String order, Integer pageSize, Integer pageNo) throws Exception {
         if (Check.isNull(order)) {
         if (Check.isNull(order)) {
             order = "DESC";
             order = "DESC";
         }
         }
@@ -103,7 +113,7 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
         if (startTime.equals(endTime) && today.equals(startTime)) {
         if (startTime.equals(endTime) && today.equals(startTime)) {
 //            total = kuaishouAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            total = kuaishouAccountReportDailyDwMapper.getProjectToDayReportTotal(projectId, startTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
-            data = kuaishouAccountReportDailyDwMapper.getProjectToDayReport(category,projectId, startTimeInt, nowHour, sortCode, order);
+            data = kuaishouAccountReportDailyDwMapper.getProjectToDayReport(category, projectId, startTimeInt, nowHour, sortCode, order);
         } else {
         } else {
 //            total = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            total = kuaishouAccountReportDailyDwMapper.getProjectMoreDaysReportTotal(projectId, startTimeInt, endTimeInt, nowHour);
 //            PageHelper.startPage(pageNo, pageSize, false);
 //            PageHelper.startPage(pageNo, pageSize, false);
@@ -114,4 +124,109 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
 //        page.setTotal(total);
 //        page.setTotal(total);
         return Result.OK(page);
         return Result.OK(page);
     }
     }
+
+    @Override
+    public Result<Object> getOperateInfo(String startTime, String endTime) {
+        try {
+            //当前小时
+            Integer hour = DateUtils.getNowHour();
+            //当天日期
+            Long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.formatDate(new Date())));
+
+            Long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
+            Long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
+            //开始日期前一天
+            String lastDay = DateUtils.getLastDay(startTime, 1);
+            //相差天数,同一天为 0
+            int days = DateUtils.dateDiff(startTime, endTime);
+            //上阶段时间
+            Long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastDay));
+            Long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(DateUtils.getLastDay(lastDay, days)));
+
+            List<String> userIds = materialStareMapper.getAllOperationByMediaId("2");
+            List<JSONObject> list = new ArrayList<>();
+            if (startDate == entDate && nowDate == startDate) {
+                list = kuaishouAccountReportDailyDwMapper.getKuaishouOperateInfoHourly(hour, startDate, entDate, lastTimeEnd, lastTimeStart, userIds);
+            } else {
+                list = kuaishouAccountReportDailyDwMapper.getKuaishouOperateInfo(startDate, entDate, lastTimeEnd, lastTimeStart, userIds);
+            }
+            PageInfo<JSONObject> pageInfo = new PageInfo<>(list);
+            return Result.successMsg("查询成功。", pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.errorMsg("查询失败了。");
+    }
+
+    @Override
+    public Result<Object> getOperateGroupInfo(String startTime, String endTime) {
+        try {
+            //当前小时
+            Integer hour = DateUtils.getNowHour();
+            //当天日期
+            Long nowDate = Long.valueOf(DateUtils.getDateInteger(DateUtils.formatDate(new Date())));
+
+            Long startDate = Long.valueOf(DateUtils.getDateInteger(startTime));
+            Long entDate = Long.valueOf(DateUtils.getDateInteger(endTime));
+
+            //开始日期前一天
+            String lastDay = DateUtils.getLastDay(startTime, 1);
+            //相差天数,同一天为 0
+            int days = DateUtils.dateDiff(startTime, endTime);
+            //上阶段时间
+            Long lastTimeEnd = Long.valueOf(DateUtils.getDateInteger(lastDay));
+            Long lastTimeStart = Long.valueOf(DateUtils.getDateInteger(DateUtils.getLastDay(lastDay, days)));
+
+            List<KuaiShouOperateGroupVo> operationManagerList = materialStareMapper.getOperationManagerUser("kuaishouOperationManager");
+            List<KuaiShouOperateGroupVo> list = new ArrayList<>();
+            for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
+                //下级员工
+                Set<String> operatorUserIds = materialStareMapper.queryOperateTeamMember(groupVo.getUserId());
+                operatorUserIds.add(groupVo.getUserId());
+                //运营数量
+                int operationNum = operatorUserIds.size();
+                //查询账户数据
+                KuaiShouOperateGroupVo vo = new KuaiShouOperateGroupVo();
+                if (startDate == entDate && nowDate == startDate) {
+                    //时报
+                    vo = kuaishouAccountReportDailyDwMapper.getKuaishouOperateGroupInfoHourly(hour, startDate, entDate, lastTimeEnd, lastTimeStart, operatorUserIds);
+                } else {
+                    vo = kuaishouAccountReportDailyDwMapper.getKuaishouOperateGroupInfo(startDate, entDate, lastTimeEnd, lastTimeStart, operatorUserIds);
+                }
+                if (Check.isNull(vo.getTotalCost())) {
+                    continue;
+                }
+                vo.setUserId(groupVo.getUserId());
+                vo.setRealname(groupVo.getRealname());
+                vo.setOperationNum(operationNum);
+                //总花费
+                Double totalCost = vo.getTotalCost();
+                //日均消耗 总花费/天数
+                Double aveDay = totalCost / (days + 1);
+                vo.setAverageDayCost(new BigDecimal(aveDay).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+                //人均消耗
+                Double avePeople = totalCost / operationNum;
+                vo.setAveragePeopleCost(new BigDecimal(avePeople).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+                //账户数量
+                long accountNum = vo.getAccountNum();
+                //平均账户消耗 总花费/账户数量
+                Double aveAccount = accountNum == 0 ? 0 : totalCost / accountNum;
+                vo.setAverageAccountCost(new BigDecimal(aveAccount).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
+                list.add(vo);
+            }
+            if (!Check.isNull(list)) {
+                Collections.sort(list, new Comparator<KuaiShouOperateGroupVo>() {
+                    @Override
+                    public int compare(KuaiShouOperateGroupVo o1, KuaiShouOperateGroupVo o2) {
+                        return o2.getTotalCost().compareTo(o1.getTotalCost());
+                    }
+                });
+            }
+            PageInfo<KuaiShouOperateGroupVo> pageInfo = new PageInfo<>(list);
+            return Result.successMsg("查询成功。", pageInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Result.errorMsg("查询失败了。");
+    }
 }
 }

+ 2 - 2
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java

@@ -1108,7 +1108,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
             if ("admin".equals(roleCode)) {
             if ("admin".equals(roleCode)) {
                 PageHelper.startPage(pageNum,pageSize);
                 PageHelper.startPage(pageNum,pageSize);
                 //查询运营经理
                 //查询运营经理
-                operationManagerList = materialStareMapper.getOperationManagerUser();
+                operationManagerList = materialStareMapper.getOperationManagerUser("kuaishouOperationManager");
             }else if (roleCode.contains("OperationManager")){
             }else if (roleCode.contains("OperationManager")){
                 operationManagerList.add(new KuaiShouOperateGroupVo(userId,userName.getString("userName")));
                 operationManagerList.add(new KuaiShouOperateGroupVo(userId,userName.getString("userName")));
             }else {
             }else {
@@ -1207,7 +1207,7 @@ public class MaterialStareServiceImpl implements MaterialStareService {
             List<KuaiShouOperateGroupVo> operationManagerList = new ArrayList<>();
             List<KuaiShouOperateGroupVo> operationManagerList = new ArrayList<>();
             if ("admin".equals(roleCode)) {
             if ("admin".equals(roleCode)) {
                 //查询运营经理
                 //查询运营经理
-                operationManagerList = materialStareMapper.getOperationManagerUser();
+                operationManagerList = materialStareMapper.getOperationManagerUser("kuaishouOperationManager");
             }else if (roleCode.contains("OperationManager")){
             }else if (roleCode.contains("OperationManager")){
                 operationManagerList.add(new KuaiShouOperateGroupVo(userId,userName.getString("userName")));
                 operationManagerList.add(new KuaiShouOperateGroupVo(userId,userName.getString("userName")));
             }else {
             }else {