yumeng 2 years ago
parent
commit
163c852bd4

+ 44 - 44
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/mapper/xml/MaterialDataMapper.xml

@@ -1274,15 +1274,15 @@
         and help_time >= #{start}
         and help_time <= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t1
@@ -1322,15 +1322,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60155
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t2 on t1.userId = t2.userId
@@ -1370,15 +1370,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60156
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t3 on t1.userId = t3.userId
@@ -1417,15 +1417,15 @@
         and stat_datetime >= #{start}
         and stat_datetime &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>) t4 on t1.userId = t4.userId
         left join
@@ -1463,15 +1463,15 @@
         and media_time >= #{start}
         and media_time &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t5 on t1.userId = t5.userId
@@ -1509,15 +1509,15 @@
         and farst_cost_time >= #{start}
         and farst_cost_time &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>) t6 on t1.userId = t6.userId
         left join (select
@@ -1554,18 +1554,18 @@
         and media_effect_date >= #{start}
         and media_effect_date &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>) t7 on t1.userId = t7.userId
-        where t1.userId is not null
+        where t1.userId != ''
         order by t1.totalCount desc
 
     </select>
@@ -1627,15 +1627,15 @@
         and help_time >= #{start}
         and help_time &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t1
@@ -1675,15 +1675,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60155
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t2 on t1.userId = t2.userId
@@ -1723,15 +1723,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60156
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t3 on t1.userId = t3.userId
@@ -1770,15 +1770,15 @@
         and stat_date >= #{start}
         and stat_date &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>) t4 on t1.userId = t4.userId
         left join
@@ -1816,15 +1816,15 @@
         and media_time >= #{start}
         and media_time &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>
         ) t5 on t1.userId = t5.userId
@@ -1862,15 +1862,15 @@
         and farst_cost_time >= #{start}
         and farst_cost_time &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>) t6 on t1.userId = t6.userId
         left join (select
@@ -1907,18 +1907,18 @@
         and media_effect_date >= #{start}
         and media_effect_date &lt;= #{end}
         <if test="role == 'clip'">
-            and clip_id is not null
+            and clip_id != ''
             group by clip_id
         </if>
         <if test="role == 'plan'">
-            and plan_id is not null
+            and plan_id != ''
             group by plan_id
         </if>
         <if test="role == 'shot'">
-            and shot_id is not null
+            and shot_id != ''
             group by shot_id
         </if>) t7 on t1.userId = t7.userId
-        where t1.userId is not null
+        where t1.userId != ''
         order by t1.totalCount desc
     </select>
     <select id="getByteDanceVideoData" resultType="com.alibaba.fastjson.JSONObject">