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

@@ -57,7 +57,7 @@ public class EnforceDeductRecordDTO{
 
     @Excel(name = "扣分时间")
     @ApiModelProperty("扣分时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date deductTime;
 
 

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

@@ -99,7 +99,6 @@ public class EnforceSuperviseController {
             query.setJobTypes(Arrays.asList(query.getJobType().split(",")));
             query.setJobType(null);
         }
-        query.setEnforceOrgId(null);
         getOrgIds(query);
         startPage();
         List<EnforceJobTimeoutDto> list = enforceSuperviseMapper.getEnforcementJobTimeOutList(query);

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

@@ -139,7 +139,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
         list.forEach(e -> {
             e.setNoProcessScore(e.getNoProcessCount() * 0.5 >= 2 ? 2 : e.getNoProcessCount() * 0.5);
             e.setTimeoutScore(e.getTimeoutCount() * 0.3 >= 2 ? 2 : e.getTimeoutCount() * 0.3);
-            e.setDeductScore(e.getDeductScore() >= 2 ? 2 : e.getDeductScore());
+//            e.setDeductScore(e.getDeductScore() >= 2 ? 2 : e.getDeductScore());
             //一个机构的
             List<WReportDeductVo> wReports = wmap.get(e.getEnforceOrgId());
             double wscore = 0;
@@ -219,6 +219,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                                     break;
                                 case 6://执法过程中违反执法公示、重大执法决定法制审核制度的；（扣0.2分/次，该项每个单位总扣分不超过2分）
                                     n6 += v * 0.2;
+                                    break;
                                 case 7:
                                     n7 += vvalue;
                                     break;
@@ -444,6 +445,7 @@ public class EnforceDeductRecordServiceImpl extends ServiceImpl<EnforceDeductRec
                                 break;
                             case 6://执法过程中违反执法公示、重大执法决定法制审核制度的；（扣0.2分/次，该项每个单位总扣分不超过2分）
                                 n6 += v * 0.2;
+                                break;
                             case 7:
                                 n7 += vvalue;
                                 break;

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

@@ -12,7 +12,7 @@
             a.deduct_value,
             a.deduct_time,
              a.deduct_resource,
-            ( SELECT sum( total_deduct ) FROM enforce_deduct_record_situation b WHERE b.deduct_record_id = a.id ) situationTimes
+            ( SELECT sum( times ) FROM enforce_deduct_record_situation b WHERE b.deduct_record_id = a.id ) situationTimes
         FROM
             enforce_deduct_record a
         <where>
@@ -102,7 +102,7 @@
         SELECT
         b.enforce_org_id,
         SUM( a.times ) AS deductCount,
-        SUM( a.total_deduct ) AS deductScore
+        SUM( b.deduct_value ) AS deductScore
         FROM
         enforce_deduct_record_situation a
         LEFT JOIN enforce_deduct_record b ON a.deduct_record_id = b.id
@@ -145,7 +145,7 @@
                 </foreach>
             </if>
             <if test="pm.executorId  != null  and pm.executorId != ''">
-                and executor_id = #{pm.executorId}
+                and user_id = #{pm.executorId}
             </if>
             <if test="pm.startDate != null and pm.startDate !=''">
                 AND s_time <![CDATA[ >= ]]> #{pm.startDate}