linjiawei il y a 1 mois
Parent
commit
72ffc29b14

+ 1 - 1
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;
 
 

+ 0 - 1
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);