浏览代码

sql优化

zhouzeyu@c-top.com.cn 3 年之前
父节点
当前提交
8ad32590ed

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

@@ -174,13 +174,13 @@ public interface MaterialReportOverViewV3Mapper {
 
     BigDecimal getKuaishouDesignTeamAvgCost(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId, @Param("companyId") String companyId);
 
-    BigDecimal getBytedanceDesignTeamGroupWork(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId);
+    BigDecimal getBytedanceDesignTeamGroupWork(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId, @Param("companyId") String companyId);
 
-    BigDecimal getKuaishouDesignTeamGroupWork(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId);
+    BigDecimal getKuaishouDesignTeamGroupWork(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId, @Param("companyId") String companyId);
 
-    int getBytedanceDesignTeaminnovativeVideoCount(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId);
+    int getBytedanceDesignTeaminnovativeVideoCount(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId, @Param("companyId") String companyId);
 
-    int getKuaishouDesignTeaminnovativeVideoCount(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId);
+    int getKuaishouDesignTeaminnovativeVideoCount(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId, @Param("companyId") String companyId);
 
     BigDecimal getBytedanceMaterialCost(@Param("startDate") Long startDate, @Param("endDate") Long endDate, @Param("leaderId") String leaderId, @Param("companyId") String companyId);
 

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

@@ -1499,7 +1499,7 @@
         SELECT  IFNULL(ROUND(COUNT(t.material_id)/
         ((SELECT COUNT(*) from sys_user where leader_id=#{leaderId} and status=1)+1),2),0)
         from  application.app_bytedance_material_info  t
-        where  t.media_time between #{startDate} and #{endDate} and leader_id=#{leaderId}
+        where  t.media_time between #{startDate} and #{endDate} and leader_id=#{leaderId} and company_id=#{companyId}
     </select>
 
     <!-- 快手组人效-->
@@ -1507,21 +1507,21 @@
         SELECT  IFNULL(ROUND(COUNT(t.material_id)/
         ((SELECT COUNT(*) from sys_user where leader_id=#{leaderId} and status=1)+1),2),0)
         from  application.app_kuaishou_material_info  t
-        where  t.media_time between #{startDate} and #{endDate} and leader_id=#{leaderId}
+        where  t.media_time between #{startDate} and #{endDate} and leader_id=#{leaderId} and company_id=#{companyId}
     </select>
 
     <!-- 头条创新视频数-->
     <select id="getBytedanceDesignTeaminnovativeVideoCount" resultType="int">
          SELECT  ifnull(count(*),0)
         from  application.app_bytedance_material_info  t
-        where  t.media_time between #{startDate} and #{endDate} and t.material_innovate=2 and leader_id=#{leaderId}
+        where  t.media_time between #{startDate} and #{endDate} and t.material_innovate=2 and leader_id=#{leaderId} and company_id=#{companyId}
     </select>
 
     <!-- 快手创新视频数-->
     <select id="getKuaishouDesignTeaminnovativeVideoCount" resultType="int">
          SELECT  ifnull(count(*),0)
         from  application.app_kuaishou_material_info  t
-        where t.media_time between #{startDate} and #{endDate} and  t.material_innovate=2 and leader_id=#{leaderId}
+        where t.media_time between #{startDate} and #{endDate} and  t.material_innovate=2 and leader_id=#{leaderId} and company_id=#{companyId}
     </select>
 
     <!-- 头条素材平均消耗-->

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/MaterialReportOverViewV2ServiceImpl.java

@@ -764,9 +764,9 @@ public class MaterialReportOverViewV2ServiceImpl implements IMaterialReportOverV
             //组内人均消耗
             BigDecimal sumCost = materialReportOverViewV3Mapper.getBytedanceDesignTeamAvgCost(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId, companyId);
             //组人效
-            BigDecimal groupWork = materialReportOverViewV3Mapper.getBytedanceDesignTeamGroupWork(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId);
+            BigDecimal groupWork = materialReportOverViewV3Mapper.getBytedanceDesignTeamGroupWork(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId,companyId);
             //创新视频数
-            int innovativeVideoCount = materialReportOverViewV3Mapper.getBytedanceDesignTeaminnovativeVideoCount(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId);
+            int innovativeVideoCount = materialReportOverViewV3Mapper.getBytedanceDesignTeaminnovativeVideoCount(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId,companyId);
             //素材平均消耗
             BigDecimal avgCost = materialReportOverViewV3Mapper.getBytedanceMaterialCost(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId, companyId);
 
@@ -779,9 +779,9 @@ public class MaterialReportOverViewV2ServiceImpl implements IMaterialReportOverV
             //组内人均消耗
             BigDecimal sumCost = materialReportOverViewV3Mapper.getKuaishouDesignTeamAvgCost(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId, companyId);
             //组人效
-            BigDecimal groupWork = materialReportOverViewV3Mapper.getKuaishouDesignTeamGroupWork(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId);
+            BigDecimal groupWork = materialReportOverViewV3Mapper.getKuaishouDesignTeamGroupWork(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId,companyId);
             //创新视频数
-            int innovativeVideoCount = materialReportOverViewV3Mapper.getKuaishouDesignTeaminnovativeVideoCount(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId);
+            int innovativeVideoCount = materialReportOverViewV3Mapper.getKuaishouDesignTeaminnovativeVideoCount(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId,companyId);
             //创新视频消耗
             BigDecimal innovativeVideoCost = materialReportOverViewV3Mapper.getKuaishouDesignTeaminnovativeVideoCost(Long.parseLong(startDate.replace("-", "")), Long.parseLong(endDate.replace("-", "")), leaderId, companyId);
             result.put("avgCost", sumCost);