Explorar o código

运营、运营组数据去除 状态限制

zhaoxian %!s(int64=2) %!d(string=hai) anos
pai
achega
cb73bd22a6

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

@@ -343,7 +343,6 @@
         LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE d.cost > 0
-        AND u.account_status = 0
         AND hour <= #{hour}
         AND d.stat_datetime >= #{lastTimeStart}
         AND d.stat_datetime <= #{lastTimeEnd}
@@ -357,7 +356,6 @@
         GROUP BY d.user_id
         ) t3 ON t.user_id = t3.user_id
         WHERE t.cost > 0
-        AND t1.account_status = 0
         AND hour <= #{hour}
         AND t.stat_datetime >= #{startDate}
         AND t.stat_datetime <= #{endDate}
@@ -390,7 +388,6 @@
         LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE d.cost > 0
-        AND u.account_status = 0
         AND d.stat_datetime >= #{lastTimeStart}
         AND d.stat_datetime <= #{lastTimeEnd}
         <if test='list!=null'>
@@ -419,7 +416,6 @@
         GROUP BY user_id
         ) t4 ON t.user_id = t4.user_id
         WHERE t.cost > 0
-        AND t1.account_status = 0
         AND t.stat_datetime >= #{startDate}
         AND t.stat_datetime &lt;= #{endDate}
         <if test='list!=null'>
@@ -457,7 +453,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.cost > 0
-        AND u.account_status = 0
         AND d.hour &lt;= #{hour}
         AND d.stat_datetime >= #{startDate}
         AND d.stat_datetime &lt;=#{endDate}
@@ -480,7 +475,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.cost > 0
-        AND u.account_status = 0
         AND d.hour &lt;= #{hour}
         AND d.stat_datetime >= #{lastTimeStart}
         AND d.stat_datetime &lt;= #{lastTimeEnd}
@@ -518,7 +512,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.cost > 0
-        AND u.account_status = 0
         AND d.stat_datetime >= #{startDate}
         AND d.stat_datetime &lt;=#{endDate}
         <if test='list!=null'>
@@ -540,7 +533,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.cost > 0
-        AND u.account_status = 0
         AND d.stat_datetime >= #{lastTimeStart}
         AND d.stat_datetime &lt;= #{lastTimeEnd}
         <if test='list!=null'>

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

@@ -381,7 +381,6 @@
         LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE d.charge > 0
-        AND u.account_status = 0
         AND hour &lt;= #{hour}
         AND d.stat_date >= #{lastTimeStart}
         AND d.stat_date &lt;= #{lastTimeEnd}
@@ -411,7 +410,6 @@
         group by user_id
         ) t4 ON t.user_id = t4.user_id
         WHERE t.charge > 0
-        AND t1.account_status = 0
         AND hour &lt;= #{hour}
         AND t.stat_date >= #{startDate}
         AND t.stat_date &lt;= #{endDate}
@@ -444,7 +442,6 @@
         LEFT JOIN `jeecg-boot`.ctop_user_allocation u ON d.account_id = u.account_id
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE d.charge > 0
-        AND u.account_status = 0
         AND d.stat_date >= #{lastTimeStart}
         AND d.stat_date &lt;= #{lastTimeEnd}
         <if test='list!=null'>
@@ -474,7 +471,6 @@
         group by user_id
         ) t4 ON t.user_id = t4.user_id
         WHERE t.charge > 0
-        AND t1.account_status = 0
         AND t.stat_date >= #{startDate}
         AND t.stat_date &lt;= #{endDate}
         <if test='list!=null'>
@@ -511,7 +507,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.charge > 0
-        AND u.account_status = 0
         AND d.hour &lt;= #{hour}
         AND d.stat_date >= #{startDate}
         AND d.stat_date &lt;=#{endDate}
@@ -534,7 +529,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.charge > 0
-        AND u.account_status = 0
         AND d.hour &lt;= #{hour}
         AND d.stat_date >= #{lastTimeStart}
         AND d.stat_date &lt;= #{lastTimeEnd}
@@ -584,7 +578,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.charge > 0
-        AND u.account_status = 0
         AND d.stat_date >= #{startDate}
         AND d.stat_date &lt;=#{endDate}
         <if test='list!=null'>
@@ -606,7 +599,6 @@
         LEFT JOIN `jeecg-boot`.sys_user suser ON d.user_id = suser.id
         WHERE
         d.charge > 0
-        AND u.account_status = 0
         AND d.stat_date >= #{lastTimeStart}
         AND d.stat_date &lt;= #{lastTimeEnd}
         <if test='list!=null'>

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

@@ -1808,8 +1808,6 @@
           AND u.id = sur.user_id
           AND u.id = c.user_id
           AND r.id = sur.role_id
-          AND u.STATUS = 1
-          AND u.del_flag = 0
           AND c.company_id='d57fecdcf7a94d009736d9c850731582'
         ORDER BY u.create_time
     </select>
@@ -1875,10 +1873,7 @@
                                            LEFT JOIN  `jeecg-boot`.ctop_user_allocation t4 ON t.user_id = t4.user_id
         WHERE  t2.role_name LIKE '%运营%'
           AND t.company_id = 'd57fecdcf7a94d009736d9c850731582'
-          AND t3.STATUS = 1
-          AND t3.del_flag = 0
           AND t4.media_id = #{mediaId}
-
     </select>
 
 </mapper>