超期任务筛选

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceDeductRecordMapper.xml

@@ -65,14 +65,13 @@
         and (
         <trim prefixOverrides="or">
         <if test="pm.startDate1  != null  and pm.startDate1 != ''">
-        or ( ej.finish_time BETWEEN #{pm.startDate1} AND #{pm.endDate1} and ev.create_time <![CDATA[ > ]]> '2024-12-23 00:00:00' )
+        or (ej.enforce_result = 'PASS' and ej.finish_time BETWEEN #{pm.startDate1} AND #{pm.endDate1} and ev.create_time <![CDATA[ > ]]> '2024-12-23 00:00:00' )
         </if>
         <if test="pm.startDate2  != null  and pm.startDate2 != ''">
-            or ( ej.finish_time BETWEEN #{pm.startDate2} AND #{pm.endDate2} and ev.create_time<![CDATA[ >  ]]> '2024-12-28 00:00:00' )
+            or (ej.enforce_result = 'PASS'  ej.finish_time BETWEEN #{pm.startDate2} AND #{pm.endDate2} and ev.create_time<![CDATA[ >  ]]> '2024-12-28 00:00:00' )
         </if>
         <if test="pm.endDate3  != null  and pm.endDate3 != ''">
             or ( ej.finish_time BETWEEN '2024-12-18 00:00:00' AND #{pm.endDate3}  and ev.create_time <![CDATA[ > ]]> DATE_ADD(ej.finish_time, INTERVAL 10 DAY) )
-            or ( ej.finish_time BETWEEN '2024-12-17 00:00:00' AND #{pm.endDate3} and ej.enforce_result = 'OVERPASS' )
         </if>
         </trim>
         )

zfjg-modules/zfjg-manage/src/main/resources/mapper/enforce/job/EnforceSuperviseMapper.xml

@@ -135,14 +135,13 @@
                 and (
                 <trim prefixOverrides="or">
                     <if test="pm.startDate1  != null  and pm.startDate1 != ''">
-                        or ( ej.finish_time BETWEEN #{pm.startDate1} AND #{pm.endDate1} and ev.create_time <![CDATA[ > ]]> '2024-12-23 00:00:00' )
+                        or (ej.enforce_result = 'PASS' and ej.finish_time BETWEEN #{pm.startDate1} AND #{pm.endDate1} and ev.create_time <![CDATA[ > ]]> '2024-12-23 00:00:00' )
                     </if>
                     <if test="pm.startDate2  != null  and pm.startDate2 != ''">
-                        or ( ej.finish_time BETWEEN #{pm.startDate2} AND #{pm.endDate2} and ev.create_time<![CDATA[ >  ]]> '2024-12-28 00:00:00' )
+                        or (ej.enforce_result = 'PASS' and ej.finish_time BETWEEN #{pm.startDate2} AND #{pm.endDate2} and ev.create_time<![CDATA[ >  ]]> '2024-12-28 00:00:00' )
                     </if>
                     <if test="pm.endDate3  != null  and pm.endDate3 != ''">
                         or ( ej.finish_time BETWEEN '2024-12-18 00:00:00' AND #{pm.endDate3}  and ev.create_time <![CDATA[ > ]]> DATE_ADD(ej.finish_time, INTERVAL 10 DAY) )
-                        or ( ej.finish_time BETWEEN '2024-12-17 00:00:00' AND #{pm.endDate3} and ej.enforce_result = 'OVERPASS' )
                     </if>
                 </trim>
                 )