Sfoglia il codice sorgente

Merge branch 'V2.0.1'

zhaoxian 2 anni fa
parent
commit
9f2e471d06
15 ha cambiato i file con 1090 aggiunte e 1177 eliminazioni
  1. 15 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java
  2. 1 4
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyInfoMapper.java
  3. 22 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml
  4. 1 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsPolicyInfoService.java
  5. 5 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java
  6. 12 12
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/ManagerSaleValueController.java
  7. 39 10
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/BytedanceAccountReportDailyDwMapper.xml
  8. 0 14
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/KuaishouAccountReportDailyDwMapper.xml
  9. 4 31
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/ManagerSaleValueMapper.xml
  10. 459 493
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialStareMapper.xml
  11. 3 3
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IManagerSaleValueService.java
  12. 57 92
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java
  13. 465 511
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java
  14. 1 1
      jeecg-boot-material-view/src/main/resources/application-dev.yml
  15. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

+ 15 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -825,6 +825,21 @@ public class CwjsPolicyInfoController {
 	}
 
 
+	 @GetMapping(value = "/queryInfo")
+	 public Result<Object> queryInfo(String advertiserName, String productName, String type) {
+		 try {
+		 	if(Check.isNull(advertiserName)||Check.isNull(productName)||Check.isNull(type)){
+		 		return Result.error("缺少参数");
+			}
+			 return cwjsPolicyInfoService.queryInfo(advertiserName, productName, type);
+		 } catch (Exception e) {
+			 e.printStackTrace();
+		 }
+		 return Result.error("查询异常");
+	 }
+
+
+
 
 	 /**
 	  *   通过id删除

+ 1 - 4
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyInfoMapper.java

@@ -93,8 +93,5 @@ public interface CwjsPolicyInfoMapper extends BaseMapper<CwjsPolicyInfo> {
                                                             @Param("accountIds") List<String> accountIds);
 
 
-
-
-
-
+    JSONObject queryInfo(@Param("advertiserName") String advertiserName,@Param("productName")  String productName,@Param("type") String type);
 }

+ 22 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -531,6 +531,28 @@
             u.auth_name
     </select>
 
+     <select id="queryInfo" resultType="com.alibaba.fastjson.JSONObject">
+         SELECT
+             t1.id as 'id',
+             t1.advertiser_name as 'advertiserName',
+             t1.media_type as 'mediaType',
+             t2.policy_product_name as 'policyProductName',
+             approved_status as 'approvedStatus',
+             advance_pay as 'advancePay',
+             rebate_type as 'rebateType',
+             rebate_rate as 'rebateRate',
+             policy_start_date as 'policyStartDate',
+             policy_end_date as 'policyEndDate'
+         FROM
+             `ctop_cwjs_policy_info` t1
+                 LEFT JOIN ctop_cwjs_policy_product t2 ON t1.id = t2.policy_id
+         WHERE t1.advertiser_name =#{advertiserName}
+           AND t1.media_type =#{type}
+           AND t2.policy_product_name =#{productName}
+         ORDER BY policy_start_date desc,policy_end_date desc
+         LIMIT 1
+     </select>
+
 
 
 

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsPolicyInfoService.java

@@ -57,4 +57,5 @@ public interface ICwjsPolicyInfoService extends IService<CwjsPolicyInfo> {
     Result getSettlementNoPictureAccountList(SettlementFileParamsVo paramsVo);
 
 
+    Result<Object> queryInfo(String advertiserName, String productName, String type);
 }

+ 5 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -316,5 +316,10 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
        return Result.successMsg("未上传结算单账户查询成功。",pageInfo);
     }
 
+    @Override
+    public Result<Object> queryInfo(String advertiserName, String productName, String type) {
+        return Result.ok(policyInfoMapper.queryInfo(advertiserName, productName, type));
+    }
+
 
 }

+ 12 - 12
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/controller/ManagerSaleValueController.java

@@ -59,12 +59,12 @@ public class ManagerSaleValueController {
      * 查询当日消耗 + 月度消耗
      */
     @GetMapping(value = "/getDayAndMonthlyCharges")
-    public Result<Object> getDayAndMonthlyCharges(String userId, String mediaId, String companyId, String startTime, String endTime, String operate) {
-        if (Check.isNull(userId) || Check.isNull(mediaId) || Check.isNull(companyId)) {
+    public Result<Object> getDayAndMonthlyCharges(String userId, String mediaId, String startTime, String endTime, String operate) {
+        if (Check.isNull(userId) || Check.isNull(mediaId)) {
             return Result.error("缺少参数");
         }
         try {
-            return managerSaleValueService.getDayAndMonthlyCharges(userId, mediaId, companyId, startTime, endTime, operate);
+            return managerSaleValueService.getDayAndMonthlyCharges(userId, mediaId, startTime, endTime, operate);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.error("查询失败");
@@ -76,7 +76,7 @@ public class ManagerSaleValueController {
      */
     @PostMapping(value = "/setUpManagerSaleValue")
     public Result<Object> setUpManagerSaleValue(@RequestBody ManagerSaleValue sale) {
-        if (Check.isNull(sale.getCompanyId()) || Check.isNull(sale.getMediaId()) || Check.isNull(sale.getUserId()) || (Check.isNull(sale.getWeeklyGoalValue()) && Check.isNull(sale.getMonthlyGoalValue()))) {
+        if (Check.isNull(sale.getMediaId()) || Check.isNull(sale.getUserId()) || (Check.isNull(sale.getWeeklyGoalValue()) && Check.isNull(sale.getMonthlyGoalValue()))) {
             return Result.error("缺少参数");
         }
         try {
@@ -92,12 +92,12 @@ public class ManagerSaleValueController {
      * 查询home页消耗+平台消耗
      */
     @GetMapping(value = "/getHomeCharges")
-    public Result<Object> getHomeCharges(String userId, String mediaId, String companyId, String startTime, String endTime) {
-        if (Check.isNull(userId) || Check.isNull(mediaId) || Check.isNull(companyId) || Check.isNull(startTime) || Check.isNull(endTime)) {
+    public Result<Object> getHomeCharges(String userId, String mediaId, String startTime, String endTime) {
+        if (Check.isNull(userId) || Check.isNull(mediaId) || Check.isNull(startTime) || Check.isNull(endTime)) {
             return Result.error("缺少参数");
         }
         try {
-            return managerSaleValueService.getHomeCharges(userId, mediaId, companyId, startTime, endTime);
+            return managerSaleValueService.getHomeCharges(userId, mediaId, startTime, endTime);
         } catch (Exception e) {
             e.printStackTrace();
             return Result.error("查询失败");
@@ -108,13 +108,13 @@ public class ManagerSaleValueController {
      * 项目消耗排行列表
      */
     @GetMapping(value = "/getProjectChargeTop")
-    public Result<Object> getProjectChargeTop(String userId, String mediaId, String companyId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+    public Result<Object> getProjectChargeTop(String userId, String mediaId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                               @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String operate) {
-        if (Check.isNull(userId) || Check.isNull(mediaId) || Check.isNull(companyId) || Check.isNull(startTime) || Check.isNull(endTime)) {
+        if (Check.isNull(userId) || Check.isNull(mediaId) || Check.isNull(startTime) || Check.isNull(endTime)) {
             return Result.error("缺少参数");
         }
         try {
-            PageInfo page = managerSaleValueService.getProjectChargeTop(userId, mediaId, companyId, startTime, endTime, operate, pageNo, pageSize);
+            PageInfo page = managerSaleValueService.getProjectChargeTop(userId, mediaId, startTime, endTime, operate, pageNo, pageSize);
             return Result.ok(page);
         } catch (Exception e) {
             e.printStackTrace();
@@ -126,11 +126,11 @@ public class ManagerSaleValueController {
      * 项目消耗排行列表
      */
     @GetMapping(value = "/getProjectChargeExcel")
-    public void getProjectChargeExcel(HttpServletResponse response, String userId, String mediaId, String companyId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+    public void getProjectChargeExcel(HttpServletResponse response, String userId, String mediaId, String startTime, String endTime, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String operate) {
         try {
 
-            PageInfo page = managerSaleValueService.getProjectChargeTop(userId, mediaId, companyId, startTime, endTime, operate, pageNo, 9999999);
+            PageInfo page = managerSaleValueService.getProjectChargeTop(userId, mediaId, startTime, endTime, operate, pageNo, 9999999);
             List<JSONObject> list = page.getList();
             List<List<Object>> excelList = new ArrayList<>();
             if (!list.isEmpty()) {

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

@@ -109,6 +109,7 @@
         IFNULL( t6.num, 0 ) AS 'num',
         IFNULL(concat(round((sum(cost) - t7.costs) / t7.costs * 100, 2), '%'), '-') as 'rio',
         IFNULL(t8.unitNum,0) as 'unitNum',
+        IFNULL(t8.projectNum,0) as 'projectNum',
         '-' AS 'ssAd',
         '-' AS 'sxhAd',
         '-' AS 'lmAd',
@@ -148,7 +149,8 @@
         </if>
         ) t7 ON t1.project_id = t7.project_id
         LEFT JOIN (
-        SELECT project_id , SUM(new_ad_num) as 'unitNum' FROM application.app_bytedance_account_base_info_d
+        SELECT project_id , SUM(new_ad_num) as 'unitNum',SUM(new_cpd_project_num) as 'projectNum' FROM
+        application.app_bytedance_account_base_info_d
         WHERE stat_date =DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id
@@ -212,6 +214,7 @@
         IFNULL(t6.num, 0 ) AS 'num',
         '-' as 'rio',
         IFNULL(t8.unitNum,0) as 'unitNum',
+        IFNULL(t8.projectNum,0) as 'projectNum',
         '-' AS 'ssAd',
         '-' AS 'sxhAd',
         '-' AS 'lmAd',
@@ -239,7 +242,8 @@
         </if>
         ) t6 ON t1.project_id = t6.project_id
         LEFT JOIN (
-        SELECT project_id , SUM(new_ad_num) as 'unitNum' FROM application.app_bytedance_account_base_info_d
+        SELECT project_id , SUM(new_ad_num) as 'unitNum',SUM(new_cpd_project_num) as 'projectNum' FROM
+        application.app_bytedance_account_base_info_d
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
         AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
@@ -330,7 +334,8 @@
         COUNT(DISTINCT t.project_id) 'projectNum',
         SUM(t.cost) 'totalCost',
         t.user_id as 'userId',
-        t2.realname as 'userName' ,
+        t2.realname as 'userName',
+        IFNULL(t4.projectNum,0) as 'projectNum',
         CONCAT(CAST(IFNULL(ROUND((SUM(t.cost) - t3.lastCost) / t3.lastCost * 100, 2), 0) AS CHAR), '%') AS 'rate',
         '-' as 'newUnitNum',
         '-' as 'newCampaignNum'
@@ -355,6 +360,12 @@
         </if>
         GROUP BY d.user_id
         ) t3 ON t.user_id = t3.user_id
+        left join (
+        SELECT user_id, SUM(new_cpd_project_num) as 'projectNum' FROM
+        app_bytedance_account_base_info_d
+        WHERE stat_date = #{startDate}
+        GROUP BY user_id
+        ) t4 ON t4.user_id = t.user_id
         WHERE t.cost > 0
         AND hour &lt;= #{hour}
         AND t.stat_datetime >= #{startDate}
@@ -375,10 +386,11 @@
         COUNT(DISTINCT t.project_id) 'projectNum',
         SUM(t.cost) 'totalCost',
         t.user_id as 'userId',
-        t2.realname as 'userName' ,
+        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'
+        IFNULL(t4.newCampaignNum,'-') as 'newCampaignNum',
+        IFNULL(t4.projectNum,0) as 'projectNum'
         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
@@ -402,7 +414,8 @@
         LEFT JOIN (
         SELECT user_id,
         IFNULL(SUM(new_ad_num),0) + IFNULL(SUM(trust_unit_num),0) as 'newUnitNum',
-        IFNULL(SUM(new_campaign_num),0) as 'newCampaignNum'
+        IFNULL(SUM(new_campaign_num),0) as 'newCampaignNum',
+        SUM(new_cpd_project_num) as 'projectNum'
         FROM application.app_bytedance_account_base_info_d
         WHERE stat_date >= #{startDate}
         AND stat_date &lt;= #{endDate}
@@ -439,7 +452,8 @@
         t3.lastCost,
         CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
         AS 'yearOnYearCost',
-        '-' as 'unitNum'
+        t4.unitNum,
+        t4.projectNum
         FROM
         (
         SELECT
@@ -486,7 +500,20 @@
             </foreach>
         </if>
         ) t3 ON 1 = 1
-
+        LEFT JOIN (
+        SELECT IFNULL(SUM(new_ad_num),'-') as 'unitNum',
+        IFNULL(SUM(new_cpd_project_num),0) as 'projectNum'
+        FROM application.app_bytedance_account_base_info_d
+        WHERE stat_date >= #{startDate}
+        AND stat_date &lt;= #{endDate}
+        <if test='list!=null and list.size()>0'>
+            AND user_id IN
+            <foreach collection="list" item="item" separator=","
+                     open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) t4 ON 1=1
     </select>
 
     <select id="getToutiaoOperateGroupInfo" resultType="com.alibaba.fastjson.JSONObject">
@@ -498,7 +525,8 @@
         t3.lastCost,
         CONCAT( CAST( IFNULL( ROUND(( SUM( t1.totalCost ) - t3.lastCost )/ t3.lastCost * 100, 2 ), 0 ) AS CHAR ), '%' )
         AS 'yearOnYearCost',
-        t4.unitNum
+        t4.unitNum,
+        t4.projectNum
         FROM
         (
         SELECT
@@ -544,7 +572,8 @@
         </if>
         ) t3 ON 1 = 1
         LEFT JOIN (
-        SELECT IFNULL(SUM(new_ad_num),'-') as 'unitNum'
+        SELECT IFNULL(SUM(new_ad_num),'-') as 'unitNum',
+        IFNULL(SUM(new_cpd_project_num),0) as 'projectNum'
         FROM application.app_bytedance_account_base_info_d
         WHERE stat_date >= #{startDate}
         AND stat_date &lt;= #{endDate}

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

@@ -8,7 +8,6 @@
                  SELECT IFNULL(sum(charge), 0.00) as 'todayCharge'
                  FROM application.kuaishou_account_report_hourly_dw
                  WHERE stat_date = #{today}
-                   AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b', 'd57fecdcf7a94d009736d9c850731582')
              ) t1
                  LEFT JOIN
              (
@@ -16,7 +15,6 @@
                  FROM application.kuaishou_account_report_hourly_dw
                  WHERE stat_date = #{yesterday}
                    AND `hour` &lt;= #{hour}
-                   AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b', 'd57fecdcf7a94d009736d9c850731582')
              ) t2
              ON 1 = 1
                  LEFT JOIN
@@ -25,7 +23,6 @@
                  FROM application.kuaishou_account_report_hourly_dw
                  WHERE stat_date >= #{monday}
                    AND stat_date &lt;= #{today}
-                   AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b', 'd57fecdcf7a94d009736d9c850731582')
              ) t3
              ON 1 = 1
                  LEFT JOIN
@@ -36,7 +33,6 @@
                    AND stat_date &lt;= DATE_FORMAT(DATE_SUB(#{lastEndDate}
                                                        , INTERVAL 1 DAY )
                      , '%Y%m%d')
-                   AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b', 'd57fecdcf7a94d009736d9c850731582')
              ) t4
              ON 1 = 1
                  LEFT JOIN
@@ -45,7 +41,6 @@
                  FROM application.kuaishou_account_report_hourly_dw
                  WHERE stat_date = #{lastEndDate}
                    AND `hour` &lt;= #{hour}
-                   AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b', 'd57fecdcf7a94d009736d9c850731582')
              ) t5 ON 1 = 1
     </select>
 
@@ -61,7 +56,6 @@
         SELECT hour as 'time', IFNULL(SUM(charge), 0.00) as 'charge'
         FROM application.kuaishou_account_report_hourly_dw
         WHERE stat_date = #{startTime}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND project_id = #{projectId}
         </if>
@@ -74,7 +68,6 @@
         FROM application.kuaishou_account_report_hourly_dw
         WHERE stat_date &lt;= #{endTime}
         AND stat_date >= #{startTime}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b', 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND project_id = #{projectId}
         </if>
@@ -89,7 +82,6 @@
         SELECT 1
         FROM application.kuaishou_account_report_hourly_dw
         WHERE stat_date = #{startTime}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND project_id = #{projectId}
         </if>
@@ -146,7 +138,6 @@
         FROM application.kuaishou_account_report_hourly_dw
         WHERE stat_date = DATE_FORMAT(DATE_SUB(#{startTime}, INTERVAL 1 DAY ), '%Y%m%d')
         AND hour &lt;= #{hour}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND project_id = #{projectId}
         </if>
@@ -183,7 +174,6 @@
         GROUP BY project_id
         ) t13 ON t1.project_id = t13.project_id
         WHERE stat_date = #{startTime}
-        AND t1.company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND t1.project_id = #{projectId}
         </if>
@@ -194,7 +184,6 @@
         SELECT project_id ,ad_scene, SUM(charge) as 'sceneCharge' FROM
         application.app_kuaishou_account_ad_scene_report_d
         WHERE stat_date = #{startTime}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id,ad_scene
         ORDER BY project_id
         ) t9 ON tt.projectId = t9.project_id
@@ -213,7 +202,6 @@
         FROM application.kuaishou_account_report_daily_dw
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND project_id = #{projectId}
         </if>
@@ -292,7 +280,6 @@
         ) t13 ON t1.project_id = t13.project_id
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
-        AND t1.company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         <if test="projectId != null and projectId != ''">
             AND t1.project_id = #{projectId}
         </if>
@@ -304,7 +291,6 @@
         application.app_kuaishou_account_ad_scene_report_d
         WHERE stat_date >= #{startTime}
         AND stat_date &lt;= #{endTime}
-        AND company_id in ('5e46b5dea3d740eeb8ff1a2895015a4b' , 'd57fecdcf7a94d009736d9c850731582')
         GROUP BY project_id,ad_scene
         ORDER BY project_id
         ) t9 ON tt.projectId = t9.project_id

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

@@ -44,7 +44,7 @@
         SELECT DISTINCT
         id
         FROM `jeecg-boot`.ctop_project
-        WHERE company_id = #{companyId}
+        WHERE 1=1
         <if test='mediaId ==2'>
             AND (media_id = 2 or media_id = 4)
         </if>
@@ -59,7 +59,7 @@
             </foreach>
         </if>
         )
-        <if test="operateUser !=null ">
+        <if test="operateUser !=null and operateUser.size()>0 ">
             AND user_id in (
             select user_id
             from `application`.app_user_manage
@@ -145,7 +145,6 @@
                     #{id}
                 </foreach>
             </if>
-            and company_id = #{companyId}
             and stat_date = DATE_FORMAT(#{statDay}, '%Y%m%d')
         </where>
         ) t
@@ -154,7 +153,6 @@
         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')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -180,7 +178,6 @@
                     #{id}
                 </foreach>
             </if>
-            and company_id = #{companyId}
             and stat_date >= DATE_FORMAT(#{statDay}, '%Y%m%d')
             and stat_date &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d')
         </where>
@@ -191,7 +188,6 @@
         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')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -299,7 +295,6 @@
         SELECT sum(cost) as 'charge'
         FROM application.bytedance_advertiser_report_daily_dw
         where stat_datetime = DATE_FORMAT(#{statDay}, '%Y%m%d')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -331,7 +326,6 @@
         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')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -452,7 +446,6 @@
         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')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -467,7 +460,6 @@
         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')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -485,7 +477,6 @@
         WHERE
         stat_date >= DATE_FORMAT(#{startTime}, '%Y%m%d')
         and stat_date &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -503,7 +494,6 @@
         WHERE
         stat_date >= DATE_FORMAT(#{startDay}, '%Y%m%d')
         and stat_date &lt;= DATE_FORMAT(#{endDay}, '%Y%m%d')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -526,7 +516,6 @@
         application.app_kuaishou_agent_report_d
         WHERE stat_date >= DATE_FORMAT( #{monthFirstday}, '%Y%m%d' )
         AND stat_date &lt;= DATE_FORMAT( #{statDay}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -542,7 +531,6 @@
         application.app_kuaishou_agent_report_d
         WHERE stat_date >= DATE_FORMAT(#{lastMonthFirstday}, '%Y%m%d' )
         AND stat_date &lt; DATE_FORMAT(#{monthFirstday}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND
             account_id IN
@@ -567,7 +555,6 @@
         application.app_bytedance_agent_report_d
         WHERE stat_datetime >= DATE_FORMAT( #{monthFirstday}, '%Y%m%d' )
         AND stat_datetime &lt;= DATE_FORMAT( #{statDay}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND
             account_id IN
@@ -600,14 +587,12 @@
         FROM `jeecg-boot`.sys_manager_sale_value
         WHERE user_id = #{userId}
           AND media_id = #{mediaId}
-          AND company_id = #{companyId}
     </select>
     <select id="getMonthly" resultType="Long">
         SELECT IFNULL(monthly_goal_value, 0)
         FROM `jeecg-boot`.sys_manager_sale_value
         WHERE user_id = #{userId}
           AND media_id = #{mediaId}
-          AND company_id = #{companyId}
     </select>
 
 
@@ -640,7 +625,6 @@
         SELECT hour,sum(charge) as 'charge'
         FROM application.kuaishou_account_report_hourly_dw
         WHERE stat_date = DATE_FORMAT(#{statDay}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -656,7 +640,6 @@
         SELECT hour,sum(cost) as 'charge'
         FROM application.bytedance_advertiser_report_hourly_dw
         WHERE stat_datetime = DATE_FORMAT(#{statDay}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id in
             <foreach collection="accountIds" item="id" separator=","
@@ -682,7 +665,6 @@
         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' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -698,7 +680,6 @@
         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' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -723,7 +704,6 @@
         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' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -739,7 +719,6 @@
         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' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             AND account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -757,7 +736,6 @@
         (select 1 from application.kuaishou_account_report_daily_dw t1
         where t1.stat_date >= DATE_FORMAT(#{startTime}, '%Y%m%d')
         and t1.stat_date &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -775,7 +753,6 @@
         (select 1 from application.bytedance_advertiser_report_daily_dw t1
         where t1.stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d')
         and t1.stat_datetime &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d')
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -808,7 +785,6 @@
         FROM application.app_kuaishou_agent_report_d
         WHERE stat_date >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND stat_date &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -820,7 +796,7 @@
         )t2 ON t1.project_id = t2.project_id
         LEFT JOIN (
         SELECT project_id, SUM( charge ) AS 'charge' FROM application.kuaishou_account_report_daily_dw
-        WHERE company_id = #{companyId}
+        WHERE 1=1
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -834,7 +810,7 @@
         left join(select id,realname from `jeecg-boot`.sys_user )t4 on t1.sale_id=t4.id
         LEFT JOIN ( SELECT t1.id, realname FROM `jeecg-boot`.ctop_project t1 LEFT JOIN `jeecg-boot`.sys_user t2 ON
         t1.responsible_id = t2.id ) t5 ON t1.project_id = t5.id
-        WHERE company_id = #{companyId}
+        WHERE 1=1
         <if test="accountIds !=null and accountIds.size()>0">
             and t1.account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -869,7 +845,6 @@
         FROM application.app_bytedance_agent_report_d
         WHERE stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND stat_datetime &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -883,7 +858,6 @@
         SELECT project_id, SUM( cost ) AS 'charge' FROM application.bytedance_advertiser_report_daily_dw
         WHERE stat_datetime >= DATE_FORMAT(DATE_ADD(#{startTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
         AND stat_datetime &lt;= DATE_FORMAT(DATE_ADD(#{endTime}, INTERVAL - ${days} DAY ), '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","
@@ -897,7 +871,6 @@
         t1.responsible_id = t2.id ) t5 ON t1.project_id = t5.id
         WHERE t1.stat_datetime >= DATE_FORMAT(#{startTime}, '%Y%m%d' )
         AND t1.stat_datetime &lt;= DATE_FORMAT(#{endTime}, '%Y%m%d' )
-        and company_id = #{companyId}
         <if test="accountIds !=null and accountIds.size()>0">
             and account_id IN
             <foreach collection="accountIds" item="id" separator=","

File diff suppressed because it is too large
+ 459 - 493
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialStareMapper.xml


+ 3 - 3
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/IManagerSaleValueService.java

@@ -18,11 +18,11 @@ public interface IManagerSaleValueService extends IService<ManagerSaleValue> {
 
     Result<Object> getCompany(String userId);
 
-    Result<Object> getDayAndMonthlyCharges(String userId, String mediaId, String companyId, String startTime, String endTime, String operate) throws ParseException;
+    Result<Object> getDayAndMonthlyCharges(String userId, String mediaId, String startTime, String endTime, String operate) throws ParseException;
 
     void setUpManagerSaleValue(ManagerSaleValue sale) throws Exception;
 
-    Result<Object> getHomeCharges(String userId, String mediaId, String companyId, String startTime, String endTime) throws ParseException;
+    Result<Object> getHomeCharges(String userId, String mediaId, String startTime, String endTime) throws ParseException;
 
-    PageInfo getProjectChargeTop(String userId, String mediaId, String companyId, String startTime, String endTime, String operate, Integer pageNo, Integer pageSize) throws Exception;
+    PageInfo getProjectChargeTop(String userId, String mediaId, String startTime, String endTime, String operate, Integer pageNo, Integer pageSize) throws Exception;
 }

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

@@ -66,13 +66,9 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     }
 
     @Override
-    public Result<Object> getDayAndMonthlyCharges(String userId, String mediaId, String companyId, String startTime, String endTime, String operate) throws ParseException {
+    public Result<Object> getDayAndMonthlyCharges(String userId, String mediaId, String startTime, String endTime, String operate) throws ParseException {
         Result<Object> result = new Result<>();
         String roleCode = baseMapper.getRoleCodeByUserId(userId);
-        Boolean bjCompany = false;
-        if ("d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
-            bjCompany = true;
-        }
         List<String> oneUserIds = new ArrayList<>();
         List<String> twoUserIds = new ArrayList<>();
         //销售总监
@@ -80,31 +76,31 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             //丁兆明特殊处理
             if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
                 //账户集合
-                List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, null);
+                List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, null);
                 if (Check.isNull(accountIds)) {
                     return Result.error("未查询到账户!");
                 }
-                JSONObject data = getManagerData(accountIds, userId, mediaId, companyId, bjCompany, null, startTime, endTime);
+                JSONObject data = getManagerData(accountIds, userId, mediaId, null, startTime, endTime);
                 return Result.ok(data);
             }
             //查询销售总监及旗下的人员 集
             List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
             saleTeaMber.add(userId);
             //账户集合
-            List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, null);
+            List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber, null);
             if (Check.isNull(accountIds)) {
                 return Result.error("未查询到账户!");
             }
-            JSONObject data = getManagerData(accountIds, userId, mediaId, companyId, bjCompany, saleTeaMber, startTime, endTime);
+            JSONObject data = getManagerData(accountIds, userId, mediaId, saleTeaMber, startTime, endTime);
             result = Result.ok(data);
             //分公司总经理
         } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
             //账户集合
-            List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, null);
+            List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, null);
             if (Check.isNull(accountIds)) {
                 return Result.error("未查询到账户!");
             }
-            JSONObject data = getManagerData(accountIds, userId, mediaId, companyId, bjCompany, null, startTime, endTime);
+            JSONObject data = getManagerData(accountIds, userId, mediaId, null, startTime, endTime);
             result = Result.ok(data);
         } else {
             result = Result.error("该用户角色权限不足!");
@@ -113,7 +109,7 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     }
 
 
-    private JSONObject getManagerData(List<Long> accountIds, String userId, String mediaId, String companyId, boolean bjCompany, List<String> saleTeaMber, String startTime, String endTime) throws ParseException {
+    private JSONObject getManagerData(List<Long> accountIds, String userId, String mediaId, List<String> saleTeaMber, String startTime, String endTime) throws ParseException {
         //当天日期
         String statDay = DateUtils.date2Str();
         //当前小时数
@@ -135,25 +131,25 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         //1 头条
         if ("1".equals(mediaId)) {
             //查询当日消耗 + 环比
-            result = baseMapper.queryTtTodayCharge(statDay, hour, accountIds, companyId);
+            result = baseMapper.queryTtTodayCharge(statDay, hour, accountIds, null);
             //周消耗
-            weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds, companyId);
+            weekCharge = baseMapper.queryTtManydaysTotalCharge(weekFirstDay, statDay, accountIds, null);
             //月消耗
-            String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds, companyId);
+            String monthCharge = baseMapper.queryTtManydaysTotalCharge(monthFirstday, statDay, accountIds, null);
             result.put("weekCharge", new BigDecimal(weekCharge));
             result.put("monthCharge", new BigDecimal(monthCharge));
             //现金消耗 + 环比ROI
-            JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, companyId);
+            JSONObject realCharged = baseMapper.queryTtRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, null);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));
             result.put("realChargedRoi", realCharged.getString("realChargedRoi"));
-            if (bjCompany) {
-                long days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
-                if (!startTime.equals(statDay)) {
-                    hour = 23;
-                }
-                JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, accountIds, companyId, days);
-                result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
-                result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
+
+            long days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
+            if (!startTime.equals(statDay)) {
+                hour = 23;
+            }
+            JSONObject oneResult = baseMapper.queryTtTodayCharge2(startTime, endTime, hour, accountIds, null, days);
+            result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
+            result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
 
                 /*//运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
                 oneAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, Arrays.asList(lichaoId));
@@ -170,27 +166,26 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 JSONObject twoResult2 = baseMapper.queryTtTodayCharge3(startTime, endTime, mediaId, hour, companyId, days);
                 result.put("twoCharge2", twoResult2.getBigDecimal("totalCharge"));
                 result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));*/
-            }
+
         } else if ("2".equals(mediaId)) {
-            result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds, companyId);
+            result = baseMapper.queryKsTodayCharge(statDay, hour, accountIds, null);
             //周消耗
-            weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds, companyId);
+            weekCharge = baseMapper.queryKsManydaysTotalCharge(weekFirstDay, statDay, accountIds, null);
             //月消耗
-            String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds, companyId);
+            String monthCharge = baseMapper.queryKsManydaysTotalCharge(monthFirstday, statDay, accountIds, null);
             result.put("weekCharge", new BigDecimal(weekCharge));
             result.put("monthCharge", new BigDecimal(monthCharge));
             //现金消耗 + 环比ROI
-            JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, companyId);
+            JSONObject realCharged = baseMapper.queryKsRealCharged(lastMonthFirstday, monthFirstday, statDay, accountIds, null);
             result.put("realCharged", realCharged.getBigDecimal("realCharged"));
             result.put("realChargedRoi", realCharged.getString("realChargedRoi"));
-            if (bjCompany) {
-                long days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
-                if (!startTime.equals(statDay)) {
-                    hour = 23;
-                }
-                JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, accountIds, companyId, days);
-                result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
-                result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
+            long days = DateUtils.getDiscrepantDays(startTime, endTime) + 1;
+            if (!startTime.equals(statDay)) {
+                hour = 23;
+            }
+            JSONObject oneResult = baseMapper.queryKsTodayCharge2(startTime, endTime, hour, accountIds, null, days);
+            result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
+            result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
                 /*result.put("oneCharge", oneResult.getBigDecimal("totalCharge"));
                 result.put("oneChargeRoi", oneResult.getString("chargeRoi"));
                 //运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
@@ -209,10 +204,9 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
                 JSONObject twoResult2 = baseMapper.queryKsTodayCharge3(startTime, endTime, mediaId, hour, companyId, days);
                 result.put("twoCharge2", twoResult2.getBigDecimal("totalCharge"));
                 result.put("twoChargeRoi2", twoResult2.getString("chargeRoi"));*/
-            }
         }
-        result.put("weeklyGoalValue", baseMapper.getWeekly(userId, companyId, mediaId));
-        result.put("monthlyGoalValue", baseMapper.getMonthly(userId, companyId, mediaId));
+        result.put("weeklyGoalValue", baseMapper.getWeekly(userId, null, mediaId));
+        result.put("monthlyGoalValue", baseMapper.getMonthly(userId, null, mediaId));
         return result;
     }
 
@@ -226,7 +220,6 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     @Override
     public void setUpManagerSaleValue(ManagerSaleValue sale) throws Exception {
         QueryWrapper<ManagerSaleValue> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id", sale.getCompanyId());
         queryWrapper.eq("media_id", sale.getMediaId());
         queryWrapper.eq("user_id", sale.getUserId());
         ManagerSaleValue one = this.getOne(queryWrapper);
@@ -245,10 +238,10 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     }
 
     @Override
-    public Result<Object> getHomeCharges(String userId, String mediaId, String companyId, String startTime, String endTime) throws ParseException {
+    public Result<Object> getHomeCharges(String userId, String mediaId, String startTime, String endTime) throws ParseException {
         String roleCode = baseMapper.getRoleCodeByUserId(userId);
 
-        List<Long> compayAllAccountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, null);
+        List<Long> compayAllAccountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, null);
         if (Check.isNull(compayAllAccountIds)) {
             return Result.error("未查询到账户!");
         }
@@ -259,9 +252,9 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             //丁兆明特殊处理
             if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
                 if (startTime.equals(endTime)) {
-                    data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime);
+                    data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, null, startTime);
                 } else {
-                    data = getManyDaysCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime, endTime);
+                    data = getManyDaysCharges(null, compayAllAccountIds, userId, mediaId, null, startTime, endTime);
                 }
                 return Result.ok(data);
             }
@@ -269,24 +262,24 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
             saleTeaMber.add(userId);
             //账户集合
-            List<Long> accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, null);
+            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, companyId, startTime);
+                data = getDailyCharges(compayAllAccountIds, accountIds, userId, mediaId, null, startTime);
 
             } else {
-                data = getManyDaysCharges(compayAllAccountIds, accountIds, userId, mediaId, companyId, startTime, endTime);
+                data = getManyDaysCharges(compayAllAccountIds, accountIds, userId, mediaId, null, startTime, endTime);
 
             }
             //分公司总经理
         } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
             if (startTime.equals(endTime)) {
-                data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime);
+                data = getDailyCharges(null, compayAllAccountIds, userId, mediaId, null, startTime);
             } else {
-                data = getManyDaysCharges(null, compayAllAccountIds, userId, mediaId, companyId, startTime, endTime);
+                data = getManyDaysCharges(null, compayAllAccountIds, userId, mediaId, null, startTime, endTime);
             }
         } else {
             return Result.error("该用户角色权限不足!");
@@ -376,20 +369,9 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
     }
 
     @Override
-    public PageInfo getProjectChargeTop(String userId, String mediaId, String companyId, String startTime, String endTime, String operate, Integer pageNo, Integer pageSize) throws Exception {
-        Boolean bjCompany = false;
+    public PageInfo getProjectChargeTop(String userId, String mediaId, String startTime, String endTime, String operate, Integer pageNo, Integer pageSize) throws Exception {
         List<String> operateUser = new ArrayList<>();
-        if ("d57fecdcf7a94d009736d9c850731582".equals(companyId) && !Check.isNull(operate)) {
-            bjCompany = true;
-            if ("1".equals(operate)) {
-                //运营一部:李超及其下级 李超 id:f6a6843879c949618e4a859140c8a127
-                operateUser.add("f6a6843879c949618e4a859140c8a127");
-            } else {
-                //运营二部:兰兰及其下级 兰兰id:461857c245f54ba5813bcb5900a23092
-                operateUser.add("461857c245f54ba5813bcb5900a23092");
-                operateUser.add("00d630a129e4487cba5427788a1f08ce");
-            }
-        }
+
         //账户集合
         List<Long> accountIds = null;
         //当天日期
@@ -400,58 +382,41 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
         if ("saleDirector".equals(roleCode) || "saleAm".equals(roleCode)) {
             //丁兆明特殊处理
             if ("b161b7d9793942f980dbfe8c931cd1b0".equals(userId) || "228c45f913924639bf20c79ce5dadb16".equals(userId)) {
-                if (bjCompany) {
-                    accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, operateUser);
-                } else {
-                    accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, null);
-                }
-
+                accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, operateUser);
                 if (Check.isNull(accountIds)) {
                     throw new Exception("未查询到账户!");
                 }
                 if (startTime.equals(endTime) && today.equals(startTime)) {
-                    return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
+                    return getProjectDailyCharges(accountIds, null, mediaId, startTime, null, pageNo, pageSize);
                 } else if (startTime.equals(endTime)) {
-                    return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, startTime, pageNo, pageSize);
+                    return getProjectDailyCharges(accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
                 } else {
-                    return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
+                    return getProjectDailyCharges(accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
                 }
             }
             //查询销售总监及旗下的人员 集
             List<String> saleTeaMber = baseMapper.querySaleDirctorItsTeamMember(userId);
             saleTeaMber.add(userId);
-            if (bjCompany) {
-                accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, operateUser);
-            } else {
-                //账户集合
-                accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, saleTeaMber, null);
-                if (Check.isNull(accountIds)) {
-                    throw new Exception("未查询到账户!");
-                }
-            }
+            accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, saleTeaMber, operateUser);
             if (startTime.equals(endTime) && today.equals(startTime)) {
-                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
+                return getProjectDailyCharges(accountIds, null, mediaId, startTime, null, pageNo, pageSize);
             } else if (startTime.equals(endTime)) {
-                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, startTime, pageNo, pageSize);
+                return getProjectDailyCharges(accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
             } else {
-                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
+                return getProjectDailyCharges(accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
             }
             //分公司总经理
         } else if ("CompanyManager".equals(roleCode) || "admin".equals(roleCode)) {
-            if (bjCompany) {
-                accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, operateUser);
-            } else {
-                accountIds = baseMapper.querySalesDirectorAccountIds(companyId, mediaId, null, null);
-            }
+            accountIds = baseMapper.querySalesDirectorAccountIds(null, mediaId, null, operateUser);
             if (Check.isNull(accountIds)) {
                 throw new Exception("未查询到账户!");
             }
             if (startTime.equals(endTime) && today.equals(startTime)) {
-                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, null, pageNo, pageSize);
+                return getProjectDailyCharges(accountIds, null, mediaId, startTime, null, pageNo, pageSize);
             } else if (startTime.equals(endTime)) {
-                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, startTime, pageNo, pageSize);
+                return getProjectDailyCharges(accountIds, null, mediaId, startTime, startTime, pageNo, pageSize);
             } else {
-                return getProjectDailyCharges(accountIds, companyId, mediaId, startTime, endTime, pageNo, pageSize);
+                return getProjectDailyCharges(accountIds, null, mediaId, startTime, endTime, pageNo, pageSize);
             }
         } else {
             throw new Exception("该用户角色权限不足!");

File diff suppressed because it is too large
+ 465 - 511
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialStareServiceImpl.java


+ 1 - 1
jeecg-boot-material-view/src/main/resources/application-dev.yml

@@ -142,7 +142,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -243,16 +243,16 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
     }
 
     private List<ProjectMember> queryProjectMemberBy(String userId, List<Integer> mediaIds) {
-        UserCompany userCompany = userCompanyService.getByUserId(userId);
-        if (Check.isNull(userCompany)) {
-            return null;
-        }
-        String companyId = userCompany.getCompanyId();
+//        UserCompany userCompany = userCompanyService.getByUserId(userId);
+//        if (Check.isNull(userCompany)) {
+//            return null;
+//        }
+//        String companyId = userCompany.getCompanyId();
         String roleCode = memberMapper.getRoleCodeByUserId(userId);
         if ("admin".equals(roleCode)) {
             return memberMapper.adminProjects(mediaIds, null);
         } else if (ArrayUtils.contains(PERMISSION_VIEW_PROJECT, roleCode)) {
-            return memberMapper.adminProjects(mediaIds, companyId);
+            return memberMapper.adminProjects(mediaIds, null);
         }
         return memberMapper.queryProjectMemberByUserId(userId, mediaIds, null);
     }