zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/enforce/job/EnforcementJobProcessQuery.java

@@ -23,6 +23,9 @@ public class EnforcementJobProcessQuery extends PageQuery {
     @ApiModelProperty(value = "任务类型:NORMAL-日常检查,SPECIAL-专项检查，REPORT-举报检查,TOWNS-乡镇检查，OTHER-其他,REVIEW-复查,BRIGADE-总队督查）")
     private String jobType;
 
+    @ApiModelProperty(value = "任务类型:NORMAL-日常检查,SPECIAL-专项检查，REPORT-举报检查,TOWNS-乡镇检查，OTHER-其他,REVIEW-复查,BRIGADE-总队督查）")
+    private List<String> jobTypes;
+
     @ApiModelProperty(value = "任务类型:NORMAL-日常检查,SPECIAL-专项检查，REPORT-举报检查,TOWNS-乡镇检查，OTHER-其他,REVIEW-复查,BRIGADE-总队督查）")
     private String jobTypeName;
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/job/EnforceSuperviseController.java

@@ -95,6 +95,11 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期列表(分页)")
     @GetMapping("/enforcement/timeout/joblist")
     public TableInfo<EnforceJobTimeoutDto> getEnforcementJobTimeOutList(EnforcementJobProcessQuery query) {
+        if (ObjectUtils.isNotEmpty(query.getJobType())) {
+            query.setJobTypes(Arrays.asList(query.getJobType().split(",")));
+            query.setJobType(null);
+        }
+        query.setEnforceOrgId(null);
         getOrgIds(query);
         startPage();
         List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
@@ -104,6 +109,10 @@ public class EnforceSuperviseController {
     @ApiOperation(value = "检查超期列表导出")
     @GetMapping(value = "/enforcement/timeout/joblist/export")
     public void getEnforcementJobTimeOutListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
+        if (ObjectUtils.isNotEmpty(query.getJobType())) {
+            query.setJobTypes(Arrays.asList(query.getJobType().split(",")));
+            query.setJobType(null);
+        }
         getOrgIds(query);
         List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
@@ -265,6 +274,9 @@ public class EnforceSuperviseController {
 
 
     public static boolean getTime(EnforcementJobProcessQuery query) {
+//        if (ObjectUtils.isNotEmpty(query.getRelate()) && query.getRelate()) {//已关联
+//            return true;
+//        }
         if (Objects.equals("evaluate", query.getEntrace())) {
         // 定义时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -281,9 +293,6 @@ public class EnforceSuperviseController {
             return false;
         }
         query.setProcess(true);
-        if (ObjectUtils.isNotEmpty(query.getRelate())) {
-            query.setRelate(false);//未关联
-        }
 
         query.setStartDate(null);
         query.setEndDate(null);

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

@@ -65,13 +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 23:59:59' )
+        or ( 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-27 00:00:00' )
+            or ( 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-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,13 +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 23:59:59' )
+                        or ( 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-27 00:00:00' )
+                        or ( 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-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>
@@ -229,6 +229,12 @@
         <if test="pm.jobType  != null  and pm.jobType != ''">
             and ej.job_type = #{pm.jobType}
         </if>
+        <if test="pm.jobTypes !=null and pm.jobTypes.size>0">
+            and ej.job_type in
+            <foreach item="item" index="i" collection="pm.jobTypes" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="pm.startDate != null and pm.startDate !=''">
             AND ej.last_enforce_date <![CDATA[ >= ]]> #{pm.startDate}
         </if>