Jelajahi Sumber

首页查询

zhaoxian 3 tahun lalu
induk
melakukan
6dc2277192

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

@@ -12,7 +12,7 @@
 
     <select id="getTotalCharge" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t1.todaycost, t2.yesterdaycost, t3.thisWeekcost, t4.lastWeek1 + t5.lastWeek2 as 'lastWeekcost'
-        FROM (
+        FROM ( 运营
                  SELECT IFNULL(sum(cost), 0.00) as 'todaycost'
                  FROM application.bytedance_advertiser_report_hourly_dw
                  WHERE stat_datetime = #{today}
@@ -94,20 +94,22 @@
 
     <select id="getProjectToDayReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        project_name AS 'projectName',
+        t1.project_id as 'projectId',
+        t3.project_name AS 'projectName',
         t2.product_name AS 'productName',
         company_name AS 'companyName',
-        t3.realname AS 'saler',
+        t5.realname AS 'saler',
         t4.realname AS 'operater',
         sum( cost ) AS 'cost',
         SUM( `show` ) AS 'aclick',
         SUM( click ) AS 'bclick',
-        IFNULL( t5.num, 0 ) AS 'num',
-        IFNULL(concat(round((sum(cost) - t6.costs) / t6.costs * 100, 2), '%'), '-') as 'rio'
+        IFNULL( t6.num, 0 ) AS 'num',
+        IFNULL(concat(round((sum(cost) - t7.costs) / t7.costs * 100, 2), '%'), '-') as 'rio'
         FROM application.bytedance_advertiser_report_hourly_dw t1
         LEFT JOIN `jeecg-boot`.ctop_product t2 ON t2.id = t1.product_id
-        LEFT JOIN `jeecg-boot`.sys_user t3 ON t1.sale_id = t3.id
-        LEFT JOIN `jeecg-boot`.sys_user t4 ON t1.user_id = t4.id
+        LEFT JOIN `jeecg-boot`.ctop_project t3 ON t1.project_id = t3.id
+        LEFT JOIN `jeecg-boot`.sys_user t4 ON t3.responsible_id = t4.id
+        LEFT JOIN `jeecg-boot`.sys_user t5 ON t3.sale_id = t5.id
         LEFT JOIN (
         SELECT tt2.project_id, sum(1) as 'num'
         FROM application.app_bytedance_material_info tt1
@@ -120,7 +122,7 @@
         <if test="projectId == null">
             GROUP BY project_id
         </if>
-        ) t5 ON t1.project_id = t5.project_id
+        ) t6 ON t1.project_id = t6.project_id
         LEFT JOIN (
         SELECT project_id, SUM(cost) as 'costs'
         FROM application.bytedance_advertiser_report_hourly_dw
@@ -133,7 +135,7 @@
         <if test="projectId == null">
             GROUP BY project_id
         </if>
-        ) t6 ON t1.project_id = t6.project_id
+        ) t7 ON t1.project_id = t7.project_id
         WHERE stat_datetime = #{startTime}
         AND t1.company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
@@ -162,20 +164,22 @@
 
     <select id="getProjectMoreDaysReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        project_name AS 'projectName',
+        t1.project_id as 'projectId',
+        t3.project_name AS 'projectName',
         t2.product_name AS 'productName',
         company_name AS 'companyName',
-        t3.realname AS 'saler',
+        t5.realname AS 'saler',
         t4.realname AS 'operater',
         sum( cost ) AS 'cost',
         SUM( `show` ) AS 'aclick',
         SUM( click ) AS 'bclick',
-        IFNULL( t5.num, 0 ) AS 'num',
+        IFNULL( t6.num, 0 ) AS 'num',
         '-' as 'rio'
         FROM application.bytedance_advertiser_report_daily_dw t1
         LEFT JOIN `jeecg-boot`.ctop_product t2 ON t2.id = t1.product_id
-        LEFT JOIN `jeecg-boot`.sys_user t3 ON t1.sale_id = t3.id
-        LEFT JOIN `jeecg-boot`.sys_user t4 ON t1.user_id = t4.id
+        LEFT JOIN `jeecg-boot`.ctop_project t3 ON t1.project_id = t3.id
+        LEFT JOIN `jeecg-boot`.sys_user t4 ON t3.responsible_id = t4.id
+        LEFT JOIN `jeecg-boot`.sys_user t5 ON t3.sale_id = t5.id
         LEFT JOIN (
         SELECT tt2.project_id, sum(1) as 'num'
         FROM application.app_bytedance_material_info tt1
@@ -189,8 +193,9 @@
         <if test="projectId == null">
             GROUP BY project_id
         </if>
-        ) t5 ON t1.project_id = t5.project_id
-        WHERE stat_datetime = #{startTime}
+        ) t6 ON t1.project_id = t6.project_id
+        WHERE stat_datetime >= #{startTime}
+        AND stat_datetime &lt;= #{endTime}
         AND t1.company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND t1.project_id = #{projectId}

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

@@ -97,14 +97,23 @@
     </select>
 
     <select id="getProjectToDayReport" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT project_name as 'projectName', t2.product_name as 'productName', company_name as 'companyName',
-        t3.realname as 'saler', t4.realname as 'operater', sum(charge) as 'charge', SUM(aclick) as 'aclick', SUM(bclick)
-        as 'bclick', IFNULL(t5.num, 0) as 'num', IFNULL(
-        concat(round((sum(charge) - t6.charges) / t6.charges * 100, 2), '%'), '-') as 'rio'
+        SELECT
+        t1.project_id as 'projectId',
+        t3.project_name AS 'projectName',
+        t2.product_name as 'productName',
+        company_name as 'companyName',
+        t5.realname AS 'saler',
+        t4.realname AS 'operater',
+        sum(charge) as 'charge',
+        SUM(aclick) as 'aclick',
+        SUM(bclick) as 'bclick',
+        IFNULL(t6.num,0) as 'num',
+        IFNULL(concat(round((sum(charge) - t7.charges) / t7.charges * 100, 2), '%'), '-') as 'rio'
         FROM application.kuaishou_account_report_hourly_dw t1
         LEFT JOIN `jeecg-boot`.ctop_product t2 ON t2.id = t1.product_id
-        LEFT JOIN `jeecg-boot`.sys_user t3 ON t1.sale_id = t3.id
-        LEFT JOIN `jeecg-boot`.sys_user t4 ON t1.user_id = t4.id
+        LEFT JOIN `jeecg-boot`.ctop_project t3 ON t1.project_id = t3.id
+        LEFT JOIN `jeecg-boot`.sys_user t4 ON t3.responsible_id = t4.id
+        LEFT JOIN `jeecg-boot`.sys_user t5 ON t3.sale_id = t5.id
         LEFT JOIN (
         SELECT tt2.project_id, sum(1) as 'num'
         FROM application.app_kuaishou_material_info tt1
@@ -117,7 +126,7 @@
         <if test="projectId == null">
             GROUP BY project_id
         </if>
-        ) t5 ON t1.project_id = t5.project_id
+        ) t6 ON t1.project_id = t6.project_id
         LEFT JOIN (
         SELECT project_id, SUM(charge) as 'charges'
         FROM application.kuaishou_account_report_hourly_dw
@@ -130,7 +139,7 @@
         <if test="projectId == null">
             GROUP BY project_id
         </if>
-        ) t6 ON t1.project_id = t6.project_id
+        ) t7 ON t1.project_id = t7.project_id
         WHERE stat_date = #{startTime}
         AND t1.company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
@@ -162,20 +171,21 @@
     <select id="getProjectMoreDaysReport" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         t1.project_id as 'projectId',
-        project_name as 'projectName',
+        t3.project_name AS 'projectName',
         t2.product_name as 'productName',
         company_name as 'companyName',
-        t3.realname as 'saler',
-        t4.realname as 'operater',
+        t5.realname AS 'saler',
+        t4.realname AS 'operater',
         sum(charge) as 'charge',
         SUM(aclick) as 'aclick',
         SUM(bclick) as 'bclick',
-        IFNULL(t5.num,0) as 'num',
+        IFNULL(t6.num,0) as 'num',
         '-' as 'rio'
         FROM application.kuaishou_account_report_daily_dw t1
         LEFT JOIN `jeecg-boot`.ctop_product t2 ON t2.id = t1.product_id
-        LEFT JOIN `jeecg-boot`.sys_user t3 ON t1.sale_id = t3.id
-        LEFT JOIN `jeecg-boot`.sys_user t4 ON t1.user_id = t4.id
+        LEFT JOIN `jeecg-boot`.ctop_project t3 ON t1.project_id = t3.id
+        LEFT JOIN `jeecg-boot`.sys_user t4 ON t3.responsible_id = t4.id
+        LEFT JOIN `jeecg-boot`.sys_user t5 ON t3.sale_id = t5.id
         LEFT JOIN (
         SELECT tt2.project_id,sum(1) as 'num' FROM application.app_kuaishou_material_info tt1
         LEFT JOIN application.kuaishou_project_material_relation tt2 ON tt1.material_id = tt2.signature
@@ -188,7 +198,7 @@
         <if test="projectId == null">
             GROUP BY project_id
         </if>
-        ) t5 ON t1.project_id = t5.project_id
+        ) t6 ON t1.project_id = t6.project_id
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
         AND t1.company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')

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

@@ -64,7 +64,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         Long weekly = baseMapper.getWeekly(userId, companyId, mediaId);
         Long monthly = baseMapper.getMonthly(userId, companyId, mediaId);
         //销售总监
-        if ("saleDirector".equals(roleCode)) {
+        if ("saleDirector".equals(roleCode) || "saleAm".equals(roleCode)) {
             //丁兆明特殊处理
             if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
                 //账户集合
@@ -192,7 +192,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
 
         JSONObject data = null;
         //销售总监
-        if ("saleDirector".equals(roleCode)) {
+        if ("saleDirector".equals(roleCode) || "saleAm".equals(roleCode)) {
             //丁兆明特殊处理
             if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
                 if (startTime.equals(endTime)) {