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

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel("其他扣分情形列表查询条件")
 public class EnforceDeductRecordQuery extends PageQuery {
@@ -12,6 +14,10 @@ public class EnforceDeductRecordQuery extends PageQuery {
     @ApiModelProperty(value = "执法机构ID")
     private String enforceOrgId;
 
+
+    @ApiModelProperty(value = "执法机构ID")
+    private List<String> enforceOrgIds;
+
     @ApiModelProperty(value = "扣分人员id")
     private String executorId;
 

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

@@ -35,4 +35,26 @@ public class EnforcementJobProcessQuery extends PageQuery {
     @ApiModelProperty(value = "结束时间")
     private String endDate;
 
+    @ApiModelProperty(value = "全过程记录跳转入口(考评：evaluate)")
+    private String entrace;
+
+    /**
+     * 10.10到10.31时间段
+     */
+    private String startDate1;
+    private String endDate1;
+
+    /**
+     * 12.17到11.1时间段
+     */
+    private String startDate2;
+    private String endDate2;
+
+    /**
+     * 大于17
+     */
+    private String endDate3;
+
+    private Boolean process;
+
 }

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

@@ -1,6 +1,7 @@
 package com.zfjg.manage.controller.enforce.job;
 
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.utils.StringUtils;
 import com.zfjg.common.core.utils.poi.ExcelUtil;
@@ -9,6 +10,7 @@ import com.zfjg.manage.api.domain.enforce.job.EnforceDeductRecord;
 import com.zfjg.manage.api.dto.enforce.job.EnforceDeductRecordDTO;
 import com.zfjg.manage.api.dto.enforce.job.EnforceDeductRecordQuery;
 import com.zfjg.manage.api.dto.enforce.job.EnforcementJobAverageTimeDTO;
+import com.zfjg.manage.api.dto.enforce.job.EnforcementJobProcessQuery;
 import com.zfjg.manage.service.enforce.job.IEnforceDeductRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.ApiOperation;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 
 import static com.zfjg.common.core.utils.PageUtils.startPage;
@@ -64,14 +67,23 @@ public class EnforceDeductRecordController {
 	@ApiOperation(value="分页查询")
     @GetMapping("/enforceDeductRecord/page")
     public TableInfo<EnforceDeductRecordDTO> getPage(EnforceDeductRecordQuery query) {
+        getOrgIds(query);
         startPage();
         List<EnforceDeductRecordDTO> list = enforceDeductRecordService.selectEnforceDeductRecordList(query);
         return new TableInfo<>(list);
     }
 
+    public void getOrgIds(EnforceDeductRecordQuery query) {
+        if (ObjectUtils.isNotEmpty(query.getEnforceOrgId())) {
+            query.setEnforceOrgIds(Arrays.asList(query.getEnforceOrgId().split(",")));
+        }
+        query.setEnforceOrgId(null);
+    }
+
     @ApiOperation(value="列表导出")
     @GetMapping("/enforceDeductRecord/page/export")
     public void export(HttpServletResponse response, EnforceDeductRecordQuery query) {
+        getOrgIds(query);
         List<EnforceDeductRecordDTO> list = enforceDeductRecordService.selectEnforceDeductRecordList(query);
         list.forEach(e->{
             String name = "";

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

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -62,6 +64,9 @@ public class EnforceSuperviseController {
     @GetMapping("/enforcement/process/joblist")
     public TableInfo<EnforcementJobProcessDTO> getEnforcementJobProcessList(EnforcementJobProcessQuery query) {
         getOrgIds(query);
+        if (!getTime(query)) {//执法全过程无记录数量
+            return new TableInfo<>(new ArrayList<>());
+        }
         startPage();
         List<EnforcementJobProcessDTO> list = enforceSuperviseMapper.getEnforcementJobProcessList(query);
         return new TableInfo<>(list);
@@ -71,6 +76,9 @@ public class EnforceSuperviseController {
     @GetMapping(value = "/enforcement/process/joblist/export")
     public void getEnforcementJobProcessListExport(HttpServletResponse response, EnforcementJobProcessQuery query) {
         getOrgIds(query);
+        if (!getTime(query)) {//执法全过程无记录数量
+            return;
+        }
         List<EnforcementJobProcessDTO> list = enforceSuperviseMapper.getEnforcementJobProcessList(query);
         if (com.zfjg.common.core.utils.StringUtils.isEmpty(list)) {
             return;
@@ -255,6 +263,63 @@ public class EnforceSuperviseController {
         query.setEnforceOrgId(null);
     }
 
+
+    public static boolean getTime(EnforcementJobProcessQuery query) {
+        if (Objects.equals("evaluate", query.getEntrace())) {
+        // 定义时间格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String startDate = query.getStartDate();
+        String endDate = query.getEndDate();
+        // 传递过来的两个时间段
+        LocalDateTime start = LocalDateTime.parse(startDate, formatter);
+        LocalDateTime end = LocalDateTime.parse(endDate, formatter);
+
+        LocalDateTime start1 = LocalDateTime.parse("2024-10-10 00:00:00",formatter);
+        LocalDateTime end1 = LocalDateTime.parse("2024-10-31 23:59:59", formatter);
+        //时间段早于2024-10-10,无过程记录
+        if (end.isBefore(start1)) {
+            return false;
+        }
+        query.setProcess(true);
+        if (ObjectUtils.isNotEmpty(query.getRelate())) {
+            query.setRelate(false);//未关联
+        }
+
+        query.setStartDate(null);
+        query.setEndDate(null);
+        LocalDateTime start2 = LocalDateTime.parse("2024-11-01 23:59:59", formatter);
+        LocalDateTime  end2 = LocalDateTime.parse("2024-12-17 00:00:00",formatter);
+
+        //时间段大于2024-11-01
+        if (start.isAfter(end2)) {
+            query.setStartDate2(startDate);
+            query.setEndDate2(endDate);
+            return true;
+        }
+        if (end.isAfter(end2)) {
+            query.setEndDate3(endDate);
+        }
+
+        // 计算交集
+        LocalDateTime intersectionStart1 = start.isAfter(start1) ? start : start1;
+        LocalDateTime intersectionEnd1 = end.isBefore(end1) ? end : end1;
+
+        LocalDateTime intersectionStart2 = start.isAfter(start2) ? start : start2;
+        LocalDateTime intersectionEnd2 = end.isBefore(end2) ? end : end2;
+
+        // 检查是否有交集
+        if (!intersectionStart1.isAfter(intersectionEnd1)) {
+            query.setStartDate1(intersectionStart1.format(formatter));
+            query.setEndDate1(intersectionEnd1.format(formatter));
+        }
+        if (!intersectionStart2.isAfter(intersectionEnd2)) {
+            query.setStartDate2(intersectionStart2.format(formatter));
+            query.setEndDate2(intersectionEnd2.format(formatter));
+        }
+        }
+        return true;
+    }
+
     public void getTypeName(EnforcementJobProcessQuery query){
         if (ObjectUtils.isNotEmpty(query.getJobType())) {
             switch (query.getJobType()) {

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/job/EnforceDeductRecordServiceImpl.java

@@ -116,7 +116,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
 
     @Override
     public List<EnforceDeductRecordDTO> selectEnforceDeductRecordList(EnforceDeductRecordQuery query) {
-        if (ObjectUtil.isEmpty(query.getEnforceOrgId())) {
+        if (ObjectUtils.isEmpty(query.getEnforceOrgIds())) {
             String orgId = SecurityUtils.getOrgId();
             List<SysDept> sysDepts = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
                     .select(SysDept::getRegionCode, SysDept::getParentId)
@@ -145,49 +145,46 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
             double wscore = 0;
             double nscore = 0;
             double sscore = 0;
-            double w1 = 0, w2 = 0, w3 = 0, w4 = 0, w5 = 0, w6 = 0, w7 = 0, w8 = 0, w9 = 0, w10 = 0;
-            double n1 = 0, n2 = 0, n3 = 0, n4 = 0, n5 = 0, n6 = 0, n7 = 0, n8 = 0, n9 = 0, n10 = 0, n11 = 0, n12 = 0, n13 = 0;
-            double s1 = 0, s2 = 0, s3 = 0, s4 = 0, s5 = 0, s6 = 0, s7 = 0, s8 = 0, s9 = 0, s10 = 0, s11 = 0, s12 = 0, s13 = 0, s14 = 0, s15 = 0, s16 = 0, s17 = 0, s18 = 0;
+            double w0 = 0,w1 = 0, w2 = 0, w3 = 0, w4 = 0, w5 = 0, w6 = 0, w7 = 0, w8 = 0;
+            double n0 = 0,n1 = 0, n2 = 0, n3 = 0, n4 = 0, n5 = 0, n6 = 0, n7 = 0, n8 = 0, n9 = 0, n10 = 0, n11 = 0;
+            double s0 = 0,s1 = 0, s2 = 0, s3 = 0, s4 = 0, s5 = 0, s6 = 0, s7 = 0, s8 = 0, s9 = 0, s10 = 0, s11 = 0, s12 = 0, s13 = 0, s14 = 0, s15 = 0, s16 = 0;
             int wrongCount = 0;
             if (ObjectUtils.isNotEmpty(wReports)) {
                 for (WReportDeductVo w : wReports) {
                     //（一）不当履行职责
                     if (w.getWTypeC() > 0) {
                         JSONArray warray =  JSON.parseArray(w.getWTypeT());
-                        for (int i = 1; i <= 9; i++) {
-                            int v = ((JSONObject)warray.get(i-1)).getInteger("num" + i);
+                        for (int i = 0; i <= 8; i++) {
+                            int v = ((JSONObject)warray.get(i)).getInteger("num" + (i+1));
                             wrongCount += v;
                             double vvalue = v * 0.1;
                             switch (i) {
+                                case 0:
+                                    w0 += vvalue;
+                                    break;
                                 case 1:
                                     w1 += vvalue;
                                     break;
-                                case 2:
-                                    w2 += vvalue;
+                                case 2://监督执法事项未通过消防监督管理系统进行流转、办理的，以及无正当理由随意删除、作废的；（扣0.5分/次，该项每个单位总扣分不超过2分）
+                                    w2 += v * 0.5;
                                     break;
-                                case 3://监督执法事项未通过消防监督管理系统进行流转、办理的，以及无正当理由随意删除、作废的；（扣0.5分/次，该项每个单位总扣分不超过2分）
-                                    w3 += v * 0.5;
+                                case 3://选择性执法或者错误适用行政处罚裁量标准一类阶次及以上，执法行为明显不当或者执法结果明显不公正的；（扣0.3分/次，该项每个单位总扣分不超过2分）
+                                    w3 += v * 0.3;
                                     break;
-                                case 4://选择性执法或者错误适用行政处罚裁量标准一类阶次及以上，执法行为明显不当或者执法结果明显不公正的；（扣0.3分/次，该项每个单位总扣分不超过2分）
-                                    w4 += v * 0.3;
+                                case 4://作出终止调查或不予处罚决定不符合规定的；（扣2分/次，该项每个单位总扣分不超过2分）
+                                    w4 += v * 2;
                                     break;
-                                case 5://作出终止调查或不予处罚决定不符合规定的；（扣2分/次，该项每个单位总扣分不超过2分）
-                                    w5 += v * 2;
+                                case 5:
+                                    w5 += vvalue;
                                     break;
                                 case 6:
                                     w6 += vvalue;
                                     break;
-                                case 7:
-                                    w7 += vvalue;
-                                    break;
-                                case 8://当事人不履行罚款决定，且在法定期限内不申请行政复议或者提起行政诉讼的，自期限届满之日起三个月内，未依法申请人民法院强制执行的；（扣0.3分/次，该项每个单位总扣分不超过2分
-                                    w8 += v * 0.3;
+                                case 7://当事人不履行罚款决定，且在法定期限内不申请行政复议或者提起行政诉讼的，自期限届满之日起三个月内，未依法申请人民法院强制执行的；（扣0.3分/次，该项每个单位总扣分不超过2分
+                                    w7 += v * 0.3;
                                     break;
-                                case 9:
-                                    w9 += vvalue;
-                                    break;
-                                case 10:
-                                    w10 += vvalue;
+                                case 8:
+                                    w8 += vvalue;
                                     break;
                                 default:
                                     break;
@@ -197,11 +194,14 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     //（二）未履行职责
                     if (w.getNTypeC() > 0) {
                         JSONArray narray =  JSON.parseArray(w.getNTypeT());
-                        for (int i = 1; i <= 12; i++) {
-                            int v = ((JSONObject)narray.get(i-1)).getInteger("wlxNum" + i);
+                        for (int i = 0; i <= 11; i++) {
+                            int v = ((JSONObject)narray.get(i)).getInteger("wlxNum" + (i+1));
                             wrongCount += v;
                             double vvalue = v * 0.1;
                             switch (i) {
+                                case 0:
+                                    n0 += vvalue;
+                                    break;
                                 case 1:
                                     n1 += vvalue;
                                     break;
@@ -234,12 +234,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                                 case 11:
                                     n11 += vvalue;
                                     break;
-                                case 12:
-                                    n12 += vvalue;
-                                    break;
-                                case 13:
-                                    n13 += vvalue;
-                                    break;
                                 default:
                                     break;
                             }
@@ -248,11 +242,14 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                     //（三）违法履行职责
                     if (w.getSTypeC() > 0) {
                         JSONArray sarray =  JSON.parseArray(w.getSTypeT());
-                        for (int i = 1; i <= 17; i++) {
-                            int v = ((JSONObject)sarray.get(i-1)).getInteger("wflxNum" + i);
+                        for (int i = 0; i <= 16; i++) {
+                            int v = ((JSONObject)sarray.get(i)).getInteger("wflxNum" + (i+1));
                             wrongCount += v;
                             double vvalue = v * 0.1;
                             switch (i) {
+                                case 0:
+                                    s0 += vvalue;
+                                    break;
                                 case 1:
                                     s1 += vvalue;
                                     break;
@@ -271,14 +268,14 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                                 case 6:
                                     s6 += vvalue;
                                     break;
-                                case 7://无故拖延，不在法定期限内作出行政决定的（扣0.3分/次，该项每个单位总扣分不超过2分）
-                                    s7 += v * 0.3;
+                                case 7:
+                                    s7 += vvalue;
                                     break;
                                 case 8:
                                     s8 += vvalue;
                                     break;
-                                case 9:
-                                    s9 += vvalue;
+                                case 9://无故拖延，不在法定期限内作出行政决定的（扣0.3分/次，该项每个单位总扣分不超过2分）
+                                    s9 += v * 0.3;
                                     break;
                                 case 10:
                                     s10 += vvalue;
@@ -301,12 +298,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                                 case 16:
                                     s16 += vvalue;
                                     break;
-                                case 17:
-                                    s17 += vvalue;
-                                    break;
-                                case 18:
-                                    s18 += vvalue;
-                                    break;
                                 default:
                                     break;
                             }
@@ -315,6 +306,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 }
             }
 
+            w0 = w0 >= 2 ? 2 : w0;
             w1 = w1 >= 2 ? 2 : w1;
             w2 = w2 >= 2 ? 2 : w2;
             w3 = w3 >= 2 ? 2 : w3;
@@ -323,11 +315,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
             w6 = w6 >= 2 ? 2 : w6;
             w7 = w7 >= 2 ? 2 : w7;
             w8 = w8 >= 2 ? 2 : w8;
-            w9 = w9 >= 2 ? 2 : w9;
-            w10 = w10 >= 2 ? 2 : w10;
-            wscore = w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9 + w10;
+            wscore = w0+w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 ;
 
 
+            n0 = n0 >= 2 ? 2 : n0;
             n1 = n1 >= 2 ? 2 : n1;
             n2 = n2 >= 2 ? 2 : n2;
             n3 = n3 >= 2 ? 2 : n3;
@@ -339,10 +330,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
             n9 = n9 >= 2 ? 2 : n9;
             n10 = n10 >= 2 ? 2 : n10;
             n11 = n11 >= 2 ? 2 : n11;
-            n12 = n12 >= 2 ? 2 : n12;
-            n13 = n13 >= 2 ? 2 : n13;
-            nscore = n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10 + n11 + n12 + n13;
+            nscore = n0+n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10 + n11;
 
+            s0 = s0 >= 2 ? 2 : s0;
             s1 = s1 >= 2 ? 2 : s1;
             s2 = s2 >= 2 ? 2 : s2;
             s3 = s3 >= 2 ? 2 : s3;
@@ -359,9 +349,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
             s14 = s14 >= 2 ? 2 : s14;
             s15 = s15 >= 2 ? 2 : s15;
             s16 = s16 >= 2 ? 2 : s16;
-            s17 = s17 >= 2 ? 2 : s17;
-            s18 = s18 >= 2 ? 2 : s18;
-            sscore = s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10 + s11 + s12 + s13 + s14 + s15 + s16 + s17 + s17 + s18;
+            sscore = s0+s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10 + s11 + s12 + s13 + s14 + s15 + s16;
 
             e.setWrongCount(wrongCount);
             e.setWrongScore(wscore + nscore + sscore);
@@ -384,47 +372,44 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 double wscore = 0;
                 double nscore = 0;
                 double sscore = 0;
-                double w1 = 0, w2 = 0, w3 = 0, w4 = 0, w5 = 0, w6 = 0, w7 = 0, w8 = 0, w9 = 0, w10 = 0;
-                double n1 = 0, n2 = 0, n3 = 0, n4 = 0, n5 = 0, n6 = 0, n7 = 0, n8 = 0, n9 = 0, n10 = 0, n11 = 0, n12 = 0, n13 = 0;
-                double s1 = 0, s2 = 0, s3 = 0, s4 = 0, s5 = 0, s6 = 0, s7 = 0, s8 = 0, s9 = 0, s10 = 0, s11 = 0, s12 = 0, s13 = 0, s14 = 0, s15 = 0, s16 = 0, s17 = 0, s18 = 0;
+                double w0 = 0,w1 = 0, w2 = 0, w3 = 0, w4 = 0, w5 = 0, w6 = 0, w7 = 0, w8 = 0;
+                double n0 = 0,n1 = 0, n2 = 0, n3 = 0, n4 = 0, n5 = 0, n6 = 0, n7 = 0, n8 = 0, n9 = 0, n10 = 0, n11 = 0;
+                double s0 = 0,s1 = 0, s2 = 0, s3 = 0, s4 = 0, s5 = 0, s6 = 0, s7 = 0, s8 = 0, s9 = 0, s10 = 0, s11 = 0, s12 = 0, s13 = 0, s14 = 0, s15 = 0, s16 = 0;
                 int wrongCount = 0;
                 //（一）不当履行职责
                 if (w.getWTypeC() > 0) {
                     JSONArray warray =  JSON.parseArray(w.getWTypeT());
-                    for (int i = 1; i <= 9; i++) {
-                        int v = ((JSONObject)warray.get(i-1)).getInteger("num" + i);
+                    for (int i = 0; i <= 8; i++) {
+                        int v = ((JSONObject)warray.get(i)).getInteger("num" + (i+1));
                         wrongCount += v;
                         double vvalue = v * 0.1;
                         switch (i) {
+                            case 0:
+                                w0 += vvalue;
+                                break;
                             case 1:
                                 w1 += vvalue;
                                 break;
-                            case 2:
-                                w2 += vvalue;
+                            case 2://监督执法事项未通过消防监督管理系统进行流转、办理的，以及无正当理由随意删除、作废的；（扣0.5分/次，该项每个单位总扣分不超过2分）
+                                w2 += v * 0.5;
                                 break;
-                            case 3://监督执法事项未通过消防监督管理系统进行流转、办理的，以及无正当理由随意删除、作废的；（扣0.5分/次，该项每个单位总扣分不超过2分）
-                                w3 += v * 0.5;
+                            case 3://选择性执法或者错误适用行政处罚裁量标准一类阶次及以上，执法行为明显不当或者执法结果明显不公正的；（扣0.3分/次，该项每个单位总扣分不超过2分）
+                                w3 += v * 0.3;
                                 break;
-                            case 4://选择性执法或者错误适用行政处罚裁量标准一类阶次及以上，执法行为明显不当或者执法结果明显不公正的；（扣0.3分/次，该项每个单位总扣分不超过2分）
-                                w4 += v * 0.3;
+                            case 4://作出终止调查或不予处罚决定不符合规定的；（扣2分/次，该项每个单位总扣分不超过2分）
+                                w4 += v * 2;
                                 break;
-                            case 5://作出终止调查或不予处罚决定不符合规定的；（扣2分/次，该项每个单位总扣分不超过2分）
-                                w5 += v * 2;
+                            case 5:
+                                w5 += vvalue;
                                 break;
                             case 6:
                                 w6 += vvalue;
                                 break;
-                            case 7:
-                                w7 += vvalue;
-                                break;
-                            case 8://当事人不履行罚款决定，且在法定期限内不申请行政复议或者提起行政诉讼的，自期限届满之日起三个月内，未依法申请人民法院强制执行的；（扣0.3分/次，该项每个单位总扣分不超过2分
-                                w8 += v * 0.3;
+                            case 7://当事人不履行罚款决定，且在法定期限内不申请行政复议或者提起行政诉讼的，自期限届满之日起三个月内，未依法申请人民法院强制执行的；（扣0.3分/次，该项每个单位总扣分不超过2分
+                                w7 += v * 0.3;
                                 break;
-                            case 9:
-                                w9 += vvalue;
-                                break;
-                            case 10:
-                                w10 += vvalue;
+                            case 8:
+                                w8 += vvalue;
                                 break;
                             default:
                                 break;
@@ -434,11 +419,14 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 //（二）未履行职责
                 if (w.getNTypeC() > 0) {
                     JSONArray narray =  JSON.parseArray(w.getNTypeT());
-                    for (int i = 1; i <= 12; i++) {
-                        int v = ((JSONObject)narray.get(i-1)).getInteger("wlxNum" + i);
+                    for (int i = 0; i <= 11; i++) {
+                        int v = ((JSONObject)narray.get(i)).getInteger("wlxNum" + (i+1));
                         wrongCount += v;
                         double vvalue = v * 0.1;
                         switch (i) {
+                            case 0:
+                                n0 += vvalue;
+                                break;
                             case 1:
                                 n1 += vvalue;
                                 break;
@@ -471,12 +459,6 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                             case 11:
                                 n11 += vvalue;
                                 break;
-                            case 12:
-                                n12 += vvalue;
-                                break;
-                            case 13:
-                                n13 += vvalue;
-                                break;
                             default:
                                 break;
                         }
@@ -485,11 +467,14 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 //（三）违法履行职责
                 if (w.getSTypeC() > 0) {
                     JSONArray sarray =  JSON.parseArray(w.getSTypeT());
-                    for (int i = 1; i <= 17; i++) {
-                        int v = ((JSONObject)sarray.get(i-1)).getInteger("wflxNum" + i);
+                    for (int i = 0; i <= 16; i++) {
+                        int v = ((JSONObject)sarray.get(i)).getInteger("wflxNum" + (i+1));
                         wrongCount += v;
                         double vvalue = v * 0.1;
                         switch (i) {
+                            case 0:
+                                s0 += vvalue;
+                                break;
                             case 1:
                                 s1 += vvalue;
                                 break;
@@ -508,14 +493,14 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                             case 6:
                                 s6 += vvalue;
                                 break;
-                            case 7://无故拖延，不在法定期限内作出行政决定的（扣0.3分/次，该项每个单位总扣分不超过2分）
-                                s7 += v * 0.3;
+                            case 7:
+                                s7 += vvalue;
                                 break;
                             case 8:
                                 s8 += vvalue;
                                 break;
-                            case 9:
-                                s9 += vvalue;
+                            case 9://无故拖延，不在法定期限内作出行政决定的（扣0.3分/次，该项每个单位总扣分不超过2分）
+                                s9 += v * 0.3;
                                 break;
                             case 10:
                                 s10 += vvalue;
@@ -538,18 +523,13 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                             case 16:
                                 s16 += vvalue;
                                 break;
-                            case 17:
-                                s17 += vvalue;
-                                break;
-                            case 18:
-                                s18 += vvalue;
-                                break;
                             default:
                                 break;
                         }
                     }
                 }
 
+                w0 = w0 >= 2 ? 2 : w0;
                 w1 = w1 >= 2 ? 2 : w1;
                 w2 = w2 >= 2 ? 2 : w2;
                 w3 = w3 >= 2 ? 2 : w3;
@@ -558,11 +538,10 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 w6 = w6 >= 2 ? 2 : w6;
                 w7 = w7 >= 2 ? 2 : w7;
                 w8 = w8 >= 2 ? 2 : w8;
-                w9 = w9 >= 2 ? 2 : w9;
-                w10 = w10 >= 2 ? 2 : w10;
-                wscore = w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 + w9 + w10;
+                wscore = w0+w1 + w2 + w3 + w4 + w5 + w6 + w7 + w8 ;
 
 
+                n0 = n0 >= 2 ? 2 : n0;
                 n1 = n1 >= 2 ? 2 : n1;
                 n2 = n2 >= 2 ? 2 : n2;
                 n3 = n3 >= 2 ? 2 : n3;
@@ -574,10 +553,9 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 n9 = n9 >= 2 ? 2 : n9;
                 n10 = n10 >= 2 ? 2 : n10;
                 n11 = n11 >= 2 ? 2 : n11;
-                n12 = n12 >= 2 ? 2 : n12;
-                n13 = n13 >= 2 ? 2 : n13;
-                nscore = n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10 + n11 + n12 + n13;
+                nscore = n0+n1 + n2 + n3 + n4 + n5 + n6 + n7 + n8 + n9 + n10 + n11;
 
+                s0 = s0 >= 2 ? 2 : s0;
                 s1 = s1 >= 2 ? 2 : s1;
                 s2 = s2 >= 2 ? 2 : s2;
                 s3 = s3 >= 2 ? 2 : s3;
@@ -594,9 +572,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                 s14 = s14 >= 2 ? 2 : s14;
                 s15 = s15 >= 2 ? 2 : s15;
                 s16 = s16 >= 2 ? 2 : s16;
-                s17 = s17 >= 2 ? 2 : s17;
-                s18 = s18 >= 2 ? 2 : s18;
-                sscore = s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10 + s11 + s12 + s13 + s14 + s15 + s16 + s17 + s17 + s18;
+                sscore = s0+s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10 + s11 + s12 + s13 + s14 + s15 + s16;
 
 //                w.setWrongCount(wrongCount);
                 w.setNTypeScore(nscore);

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

@@ -80,10 +80,10 @@
             </foreach>
         </if>
         <if test="pm.startDate != null and pm.startDate !=''">
-            AND 检查期限 <![CDATA[ >= ]]> #{pm.startDate}
+            AND 结束执行任务时间 <![CDATA[ >= ]]> #{pm.startDate}
         </if>
         <if test="pm.endDate != null and pm.endDate !=''">
-            AND 检查期限 <![CDATA[ <= ]]> #{pm.endDate}
+            AND 结束执行任务时间 <![CDATA[ <= ]]> #{pm.endDate}
         </if>
         AND 状态 = '已归档'
         ) r
@@ -94,7 +94,7 @@
 
     <select id="getEnforcementJobProcessList" resultType="com.zfjg.manage.api.dto.enforce.job.EnforcementJobProcessDTO">
         SELECT
-            *
+            *,count(evid) videoNum
         FROM
             (
                 SELECT
@@ -109,9 +109,10 @@
                     ej.enforce_obj_name,
                     ej.enforce_org_id,
                     ej.enforce_org_name,
-                    ( SELECT count( 1 ) FROM enforce_video ev WHERE ev.is_deleted = 0 AND ev.enfore_job_id = ej.id ) videoNum
+                    ev.id evid
                 FROM
                     enforce_job ej
+                    left join enforce_video ev on ej.id = ev.enfore_job_id and ev.is_deleted=0
                 WHERE
                     ej.is_deleted = 0 AND ej.job_status = 'ARCHIVED'
                     AND ej.enforce_org_id not in ('55c99876ec0f425aac6925a92cceeb17','256069491270746112')
@@ -130,20 +131,37 @@
             <if test="pm.jobType  != null  and pm.jobType != ''">
                 and ej.job_type = #{pm.jobType}
             </if>
+            <if test="pm.process  != null  and pm.process == true ">
+                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' )
+                    </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' )
+                    </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>
+                )
+            </if>
             <if test="pm.startDate != null and pm.startDate !=''">
                 AND ej.finish_time <![CDATA[ >= ]]> #{pm.startDate}
             </if>
             <if test="pm.endDate != null and pm.endDate !=''">
                 AND ej.finish_time <![CDATA[ <= ]]> #{pm.endDate}
             </if>
+            <if test="pm.relate  != null and pm.relate == true">
+                AND ev.id is not null
+            </if>
+            <if test="pm.relate  != null and pm.relate == false">
+                AND ev.id is null
+            </if>
             ) t
-        <if test="pm.relate  != null and pm.relate == true">
-            where t.videoNum > 0
-        </if>
-        <if test="pm.relate  != null and pm.relate == false">
-            where t.videoNum = 0
-        </if>
-        order by t.videoNum,finish_time desc
+        group by id
+        order by videoNum,finish_time desc
     </select>
 
     <select id="selectEnforceTimeout" resultType="com.zfjg.manage.api.dto.enforce.job.EnforceOrgTimeoutDto">