zhouzeyu@c-top.com.cn 3 rokov pred
rodič
commit
15479efaee

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

@@ -379,12 +379,11 @@
             <if test='dimension=="designer" and designerId!=null'>
                 and (t.clip_id=#{designerId} or t.shot_id=#{designerId} or t.plan_id=#{designerId})
             </if>
-
             <if test='type==1'>
-                and t2.tag_code='Z02Z05'
+                and t2.parent_id=60156
             </if>
             <if test='type==2'>
-                and t2.tag_code='Z01B12'
+                and t2.parent_id=60155
             </if>
             AND t.company_id=#{companyId}
         </where>
@@ -428,10 +427,10 @@
             </if>
 
             <if test='type==1'>
-                and t2.tag_code='Z02Z05'
+                and t2.parent_id=60156
             </if>
             <if test='type==2'>
-                and t2.tag_code='Z01B12'
+                and t2.parent_id=60155
             </if>
             AND t.company_id=#{companyId}
         </where>
@@ -1495,7 +1494,7 @@
     <!-- 头条组人效-->
     <select id="getBytedanceDesignTeamGroupWork" resultType="java.math.BigDecimal">
         SELECT  IFNULL(ROUND(COUNT(t.material_id)/
-        (SELECT COUNT(*) from sys_user where leader_id=#{leaderId} and status=1),2),0)
+        ((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}
     </select>
@@ -1503,7 +1502,7 @@
     <!-- 快手组人效-->
     <select id="getKuaishouDesignTeamGroupWork" resultType="java.math.BigDecimal">
         SELECT  IFNULL(ROUND(COUNT(t.material_id)/
-        (SELECT COUNT(*) from sys_user where leader_id=#{leaderId} and status=1),2),0)
+        ((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}
     </select>