瀏覽代碼

修改字段

yumeng 2 年之前
父節點
當前提交
28c5b6e903

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

@@ -1274,12 +1274,15 @@
         and help_time >= #{start}
         and help_time <= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t1
@@ -1319,12 +1322,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60155
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t2 on t1.userId = t2.userId
@@ -1364,12 +1370,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60156
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t3 on t1.userId = t3.userId
@@ -1408,12 +1417,15 @@
         and stat_datetime >= #{start}
         and stat_datetime &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>) t4 on t1.userId = t4.userId
         left join
@@ -1451,12 +1463,15 @@
         and media_time >= #{start}
         and media_time &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t5 on t1.userId = t5.userId
@@ -1494,12 +1509,15 @@
         and farst_cost_time >= #{start}
         and farst_cost_time &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>) t6 on t1.userId = t6.userId
         left join (select
@@ -1536,12 +1554,15 @@
         and media_effect_date >= #{start}
         and media_effect_date &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>) t7 on t1.userId = t7.userId
         where t1.userId is not null
@@ -1606,12 +1627,15 @@
         and help_time >= #{start}
         and help_time &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t1
@@ -1651,12 +1675,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60155
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t2 on t1.userId = t2.userId
@@ -1696,12 +1723,15 @@
         and help_time &lt;= #{end}
         and tag_id = 60156
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t3 on t1.userId = t3.userId
@@ -1740,12 +1770,15 @@
         and stat_date >= #{start}
         and stat_date &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>) t4 on t1.userId = t4.userId
         left join
@@ -1783,12 +1816,15 @@
         and media_time >= #{start}
         and media_time &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>
         ) t5 on t1.userId = t5.userId
@@ -1826,12 +1862,15 @@
         and farst_cost_time >= #{start}
         and farst_cost_time &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>) t6 on t1.userId = t6.userId
         left join (select
@@ -1868,12 +1907,15 @@
         and media_effect_date >= #{start}
         and media_effect_date &lt;= #{end}
         <if test="role == 'clip'">
+            and clip_id is not null
             group by clip_id
         </if>
         <if test="role == 'plan'">
+            and plan_id is not null
             group by plan_id
         </if>
         <if test="role == 'shot'">
+            and shot_id is not null
             group by shot_id
         </if>) t7 on t1.userId = t7.userId
         where t1.userId is not null