فهرست منبع

人效 初版2

zhaoxian 3 سال پیش
والد
کامیت
ebf3c82d13

+ 4 - 1
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/MaterialStareMapper.java

@@ -147,7 +147,10 @@ public interface MaterialStareMapper {
      */
     List<KuaiShouOperateGroupVo> getOperationManagerUser(@Param("roleCode") String roleCode);
 
-    Set<String> queryOperateTeamMember(@Param("userId") String userId);
+    Set<String> queryKuaishouOperateTeamMember(@Param("userId") String userId,@Param("startDate") Long startDate, @Param("endDate") Long endDate);
+
+    Set<String> queryToutiaoOperateTeamMember(@Param("userId") String userId,@Param("startDate") Long startDate, @Param("endDate") Long endDate);
 
     List<String> getAllOperationByMediaId(@Param("mediaId") String mediaId);
+
 }

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

@@ -1642,7 +1642,7 @@
     </select>
 
 
-    <select id="queryOperateTeamMember" resultType="String">
+    <select id="queryKuaishouOperateTeamMember" resultType="String">
         select
             u.id
         from
@@ -1650,11 +1650,48 @@
             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
+            LEFT JOIN  application.kuaishou_account_report_daily_dw t ON t.user_id = u.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
+        AND t.stat_date >=#{startDate}
+        AND t.stat_date &lt;=#{endDate}
+        AND t.charge > 0
+        AND t.company_id = 'd57fecdcf7a94d009736d9c850731582'
+        GROUP BY u.id
+        UNION all
+        SELECT DISTINCT user_id FROM application.kuaishou_account_report_daily_dw t
+        WHERE user_id = #{userId}
+          AND t.stat_date >=#{startDate}
+          AND t.stat_date &lt;=#{endDate}
+        AND t.charge > 0
+    </select>
+
+    <select id="queryToutiaoOperateTeamMember" 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
+        LEFT JOIN  application.bytedance_advertiser_report_daily_dw t ON t.user_id = u.id
+        where m.manage_id =  #{userId}
+        AND   r.role_name LIKE '%运营%'
+        AND u.STATUS = 1
+        AND u.del_flag = 0
+        AND t.stat_datetime >=#{startDate}
+        AND t.stat_datetime &lt;=#{endDate}
+        AND t.cost > 0
+        AND t.company_id = 'd57fecdcf7a94d009736d9c850731582'
+        GROUP BY u.id
+        UNION ALL
+        SELECT DISTINCT user_id FROM application.bytedance_advertiser_report_daily_dw t
+        WHERE user_id =  #{userId}
+        AND t.stat_datetime >=#{startDate}
+        AND t.stat_datetime &lt;=#{endDate}
+        AND t.cost > 0
     </select>
 
     <select id="getAllOperationByMediaId" resultType="String">

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

@@ -181,9 +181,8 @@ public class BytedanceAccountReportDailyDwServiceImpl implements IBytedanceAccou
             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());
+                //有消耗的运营人员
+                Set<String> operatorUserIds = materialStareMapper.queryToutiaoOperateTeamMember(groupVo.getUserId(),startDate, entDate);
                 //运营数量
                 int operationNum = operatorUserIds.size();
                 //查询账户数据

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

@@ -181,8 +181,7 @@ public class KuaishouAccountReportDailyDwServiceImpl implements IKuaishouAccount
             List<KuaiShouOperateGroupVo> list = new ArrayList<>();
             for (KuaiShouOperateGroupVo groupVo : operationManagerList) {
                 //下级员工
-                Set<String> operatorUserIds = materialStareMapper.queryOperateTeamMember(groupVo.getUserId());
-                operatorUserIds.add(groupVo.getUserId());
+                Set<String> operatorUserIds = materialStareMapper.queryKuaishouOperateTeamMember(groupVo.getUserId(),startDate, entDate);
                 //运营数量
                 int operationNum = operatorUserIds.size();
                 //查询账户数据