zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/domain/enforce/job/EnforceDeductRecord.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -55,6 +56,7 @@ public class EnforceDeductRecord implements Serializable {
     private Double deductValue;
 
     @ApiModelProperty("扣分时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deductTime;
 
     @ApiModelProperty("上传文件")

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/domain/other/WReport.java

@@ -1,5 +1,6 @@
 package com.zfjg.manage.api.domain.other;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -41,6 +42,7 @@ public class WReport implements Serializable {
     private String wUser;
 
     @ApiModelProperty("不当履行职责执法过错情形")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String wType;
 
     @ApiModelProperty("不当履行职责执法过错情形数量")
@@ -49,6 +51,7 @@ public class WReport implements Serializable {
     private String wTypeT;
 
     @ApiModelProperty("未履行职责执法过错情形")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String nType;
 
     @ApiModelProperty("未履行职责执法过错情形数量")
@@ -57,6 +60,7 @@ public class WReport implements Serializable {
     private String nTypeT;
 
     @ApiModelProperty("违法履行职责执法过错情形")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String sType;
 
     @ApiModelProperty("处理方式")

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

@@ -24,6 +24,10 @@ public class EnforceEvaluateQuery extends PageQuery {
     private String endDate;
 
 
+    @ApiModelProperty(value = "过错责任人")
+    private String executorId;
+
+
     /**
      * 10.10到10.31时间段
      */

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

@@ -49,7 +49,7 @@ public class EnforceDeductRecordController {
             return R.fail("扣分记录不存在，无法修改");
         }
         param.setId(id);
-        return R.ok(enforceDeductRecordService.updateById(param));
+        return R.ok(enforceDeductRecordService.updateEnforceDeductRecord(param));
     }
 
     @ApiOperation(value="根据id删除对象")

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

@@ -70,6 +70,12 @@ class EnforceEvaluateController {
         getTime(query);
     }
     public static void getTime(EnforceEvaluateQuery query) {
+        if (StringUtils.isEmpty(query.getStartDate())) {
+            query.setStartDate("1900-01-01 00:00:00");
+        }
+        if (StringUtils.isEmpty(query.getEndDate())) {
+            query.setEndDate("2099-01-01 00:00:00");
+        }
         // 定义时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 

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

@@ -274,6 +274,12 @@ public class EnforceSuperviseController {
 
 
     public static boolean getTime(EnforcementJobProcessQuery query) {
+        if (StringUtils.isEmpty(query.getStartDate())) {
+            query.setStartDate("1900-01-01 00:00:00");
+        }
+        if (StringUtils.isEmpty(query.getEndDate())) {
+            query.setEndDate("2099-01-01 00:00:00");
+        }
 //        if (ObjectUtils.isNotEmpty(query.getRelate()) && query.getRelate()) {//已关联
 //            return true;
 //        }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/WReportServiceImpl.java

@@ -66,18 +66,20 @@ public class WReportServiceImpl extends ServiceImpl<WReportMapper, WReport> impl
 
         if (ObjectUtil.isNotEmpty(reportDto.getWrongCategory())) {
             wReport.setWType(String.join("|||", reportDto.getWrongCategory()));
+        }else{
+            wReport.setWType(null);
         }
 
         if (ObjectUtil.isNotEmpty(reportDto.getNotCategory())) {
             wReport.setNType(String.join("|||", reportDto.getNotCategory()));
-
+        }else{
+            wReport.setNType(null);
         }
 
         if (ObjectUtil.isNotEmpty(reportDto.getBreakLawCategory())) {
             wReport.setSType(String.join("|||", reportDto.getBreakLawCategory()));
-
-
-
+        }else{
+            wReport.setSType(null);
         }
 
 

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.finish_time BETWEEN #{pm.startDate1} AND #{pm.endDate1} and ev.create_time <![CDATA[ > ]]> '2024-12-23 00:00:00' and ej.enforce_result = 'PASS')
         </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.finish_time BETWEEN #{pm.startDate2} AND #{pm.endDate2} and ev.create_time<![CDATA[ >  ]]> '2024-12-28 00:00:00' and ej.enforce_result = 'PASS')
         </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>
         )
@@ -91,10 +90,10 @@
         AND job_type IN ( 'NORMAL', 'REPORT' )
         AND is_deleted = 0
         <if test="pm.startDate != null and pm.startDate !=''">
-            AND finish_time <![CDATA[ >= ]]> #{pm.startDate}
+            AND last_enforce_date <![CDATA[ >= ]]> #{pm.startDate}
         </if>
         <if test="pm.endDate != null and pm.endDate !=''">
-            AND finish_time <![CDATA[ <= ]]> #{pm.endDate}
+            AND last_enforce_date <![CDATA[ <= ]]> #{pm.endDate}
         </if>
         GROUP BY
         enforce_org_id
@@ -145,6 +144,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="pm.executorId  != null  and pm.executorId != ''">
+                and executor_id = #{pm.executorId}
+            </if>
             <if test="pm.startDate != null and pm.startDate !=''">
                 AND s_time <![CDATA[ >= ]]> #{pm.startDate}
             </if>

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.finish_time BETWEEN #{pm.startDate1} AND #{pm.endDate1} and ev.create_time <![CDATA[ > ]]> '2024-12-23 00:00:00' and ej.enforce_result = 'PASS' )
                     </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.finish_time BETWEEN #{pm.startDate2} AND #{pm.endDate2} and ev.create_time<![CDATA[ >  ]]> '2024-12-28 00:00:00' and ej.enforce_result = 'PASS')
                     </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>
                 )