diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 6c6a999..b60cbe7 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -64,6 +64,7 @@
         EntityWrapper query = new EntityWrapper();
         query.eq(StrategyAlarmConst.CAR_SYS_COL, "1");
         String currTime = DateUtil.format(new Date(), "yyyy-MM-dd");
+        //读取车辆信息
         List<BusCarInfo> busCarInfos = carInfoSupportService.listCarScopeWarpper(null, query);
         if (ToolUtil.isEmpty(busCarInfos)) {
             return;
@@ -115,16 +116,11 @@
                     sets.addAll(context.execStrategy(alarmProcessDTO));
                     System.out.println("车辆定位点信息:" + sets);
                 }
-
+                //作业记录入库
 //                processJobResult(sets, alarmProcessDTO, currTime);
-                //作业统计类创建
-                JobStatisticsDay statisticsDay = new JobStatisticsDay();
-                statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId());
-                statisticsDay.setCreateTime(new Date());
-                statisticsDay.setCurrDay(currTime);
-                statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId());
-                statisticsDay.setCount(sets.stream().collect(Collectors.summingInt(ResultStatus::getNum)));
-                jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay);
+                //统计作业入库
+                processJobResult(sets, alarmProcessDTO, currTime);
+
             }
 
         }
@@ -136,7 +132,13 @@
      * @param statusSet
      */
     private void processJobResult(Set<ResultStatus> statusSet, AlarmProcessDTO<PostionDTO, RouteInfoDTO> alarmProcessDTO, String currTime) {
-
+        JobStatisticsDay statisticsDay = new JobStatisticsDay();
+        statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId());
+        statisticsDay.setCreateTime(new Date());
+        statisticsDay.setCurrDay(currTime);
+        statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId());
+        statisticsDay.setCount(statusSet.stream().collect(Collectors.summingInt(ResultStatus::getNum)));
+        jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay);
     }
 
     /**

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 6c6a999..b60cbe7 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -64,6 +64,7 @@
         EntityWrapper query = new EntityWrapper();
         query.eq(StrategyAlarmConst.CAR_SYS_COL, "1");
         String currTime = DateUtil.format(new Date(), "yyyy-MM-dd");
+        //读取车辆信息
         List<BusCarInfo> busCarInfos = carInfoSupportService.listCarScopeWarpper(null, query);
         if (ToolUtil.isEmpty(busCarInfos)) {
             return;
@@ -115,16 +116,11 @@
                     sets.addAll(context.execStrategy(alarmProcessDTO));
                     System.out.println("车辆定位点信息:" + sets);
                 }
-
+                //作业记录入库
 //                processJobResult(sets, alarmProcessDTO, currTime);
-                //作业统计类创建
-                JobStatisticsDay statisticsDay = new JobStatisticsDay();
-                statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId());
-                statisticsDay.setCreateTime(new Date());
-                statisticsDay.setCurrDay(currTime);
-                statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId());
-                statisticsDay.setCount(sets.stream().collect(Collectors.summingInt(ResultStatus::getNum)));
-                jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay);
+                //统计作业入库
+                processJobResult(sets, alarmProcessDTO, currTime);
+
             }
 
         }
@@ -136,7 +132,13 @@
      * @param statusSet
      */
     private void processJobResult(Set<ResultStatus> statusSet, AlarmProcessDTO<PostionDTO, RouteInfoDTO> alarmProcessDTO, String currTime) {
-
+        JobStatisticsDay statisticsDay = new JobStatisticsDay();
+        statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId());
+        statisticsDay.setCreateTime(new Date());
+        statisticsDay.setCurrDay(currTime);
+        statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId());
+        statisticsDay.setCount(statusSet.stream().collect(Collectors.summingInt(ResultStatus::getNum)));
+        jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay);
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java
index dbd59f1..6879e4e 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java
@@ -46,8 +46,12 @@
     @ResponseBody
     public Object jobRecord(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
         Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
+        page.setRecords(listPage(page,name,jobContent,tolietKeywords,startTime,endTime));
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    private  List<ToiletCleanLogDTO> listPage(Page<ToiletCleanLogDTO> page,String name, String jobContent, String tolietKeywords, String startTime, String endTime){
         EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        DataScope scope = null;
         if (ToolUtil.isNotEmpty(name)) {
             query.like("c.name", name);
         }
@@ -63,12 +67,7 @@
         if (ToolUtil.isNotEmpty(tolietKeywords)) {
             query.andNew().like("b.code", tolietKeywords).or().eq("b.name", tolietKeywords);
         }
-
-        List<ToiletCleanLogDTO> dtos = toiletCleanLogService.selectJobRecordPage(scope, page, query);
-
-        page.setRecords(dtos);
-
-        return ResponseData.success(super.packForBT(page));
+        return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
     /**
@@ -82,23 +81,8 @@
         Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-        if (ToolUtil.isNotEmpty(name)) {
-            query.like("c.name", name);
-        }
-        if (ToolUtil.isNotEmpty(jobContent)) {
-            query.like("a.WORK_CONTENT", jobContent);
-        }
-        if (ToolUtil.isNotEmpty(startTime)) {
-            query.ge(JobConstant.CLEAN_START_TIME, startTime);
-        }
-        if (ToolUtil.isNotEmpty(endTime)) {
-            query.le(JobConstant.CLEAN_END_TIME, endTime);
-        }
-        if (ToolUtil.isNotEmpty(tolietKeywords)) {
-            query.andNew().like("b.code", tolietKeywords).or().eq("b.name", tolietKeywords);
-        }
-
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, toiletCleanLogService.selectJobRecordPage(null, page, query).stream().map(toiletCleanLogDTO -> (Object) toiletCleanLogDTO).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = listPage(page,name,jobContent,tolietKeywords,startTime,endTime);
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> (Object) toiletCleanLogDTO).collect(Collectors.toList()));
     }
 
     /**

diff --git a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
index 6c6a999..b60cbe7 100644
--- a/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
+++ b/casic-service-car/src/main/java/com/casic/missiles/modular/system/service/impl/SanitationCarServiceImpl.java
@@ -64,6 +64,7 @@
         EntityWrapper query = new EntityWrapper();
         query.eq(StrategyAlarmConst.CAR_SYS_COL, "1");
         String currTime = DateUtil.format(new Date(), "yyyy-MM-dd");
+        //读取车辆信息
         List<BusCarInfo> busCarInfos = carInfoSupportService.listCarScopeWarpper(null, query);
         if (ToolUtil.isEmpty(busCarInfos)) {
             return;
@@ -115,16 +116,11 @@
                     sets.addAll(context.execStrategy(alarmProcessDTO));
                     System.out.println("车辆定位点信息:" + sets);
                 }
-
+                //作业记录入库
 //                processJobResult(sets, alarmProcessDTO, currTime);
-                //作业统计类创建
-                JobStatisticsDay statisticsDay = new JobStatisticsDay();
-                statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId());
-                statisticsDay.setCreateTime(new Date());
-                statisticsDay.setCurrDay(currTime);
-                statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId());
-                statisticsDay.setCount(sets.stream().collect(Collectors.summingInt(ResultStatus::getNum)));
-                jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay);
+                //统计作业入库
+                processJobResult(sets, alarmProcessDTO, currTime);
+
             }
 
         }
@@ -136,7 +132,13 @@
      * @param statusSet
      */
     private void processJobResult(Set<ResultStatus> statusSet, AlarmProcessDTO<PostionDTO, RouteInfoDTO> alarmProcessDTO, String currTime) {
-
+        JobStatisticsDay statisticsDay = new JobStatisticsDay();
+        statisticsDay.setCarId(alarmProcessDTO.getPosData().getCarInfo().getId());
+        statisticsDay.setCreateTime(new Date());
+        statisticsDay.setCurrDay(currTime);
+        statisticsDay.setRouteId(alarmProcessDTO.getRouteData().getRouteInfo().getId());
+        statisticsDay.setCount(statusSet.stream().collect(Collectors.summingInt(ResultStatus::getNum)));
+        jobSupportService.saveOrUpdateByCarIdAndRouteId(statisticsDay);
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java
index dbd59f1..6879e4e 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/controller/ToiletCleanLogController.java
@@ -46,8 +46,12 @@
     @ResponseBody
     public Object jobRecord(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
         Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
+        page.setRecords(listPage(page,name,jobContent,tolietKeywords,startTime,endTime));
+        return ResponseData.success(super.packForBT(page));
+    }
+
+    private  List<ToiletCleanLogDTO> listPage(Page<ToiletCleanLogDTO> page,String name, String jobContent, String tolietKeywords, String startTime, String endTime){
         EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        DataScope scope = null;
         if (ToolUtil.isNotEmpty(name)) {
             query.like("c.name", name);
         }
@@ -63,12 +67,7 @@
         if (ToolUtil.isNotEmpty(tolietKeywords)) {
             query.andNew().like("b.code", tolietKeywords).or().eq("b.name", tolietKeywords);
         }
-
-        List<ToiletCleanLogDTO> dtos = toiletCleanLogService.selectJobRecordPage(scope, page, query);
-
-        page.setRecords(dtos);
-
-        return ResponseData.success(super.packForBT(page));
+        return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
     /**
@@ -82,23 +81,8 @@
         Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
-        if (ToolUtil.isNotEmpty(name)) {
-            query.like("c.name", name);
-        }
-        if (ToolUtil.isNotEmpty(jobContent)) {
-            query.like("a.WORK_CONTENT", jobContent);
-        }
-        if (ToolUtil.isNotEmpty(startTime)) {
-            query.ge(JobConstant.CLEAN_START_TIME, startTime);
-        }
-        if (ToolUtil.isNotEmpty(endTime)) {
-            query.le(JobConstant.CLEAN_END_TIME, endTime);
-        }
-        if (ToolUtil.isNotEmpty(tolietKeywords)) {
-            query.andNew().like("b.code", tolietKeywords).or().eq("b.name", tolietKeywords);
-        }
-
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, toiletCleanLogService.selectJobRecordPage(null, page, query).stream().map(toiletCleanLogDTO -> (Object) toiletCleanLogDTO).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = listPage(page,name,jobContent,tolietKeywords,startTime,endTime);
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> (Object) toiletCleanLogDTO).collect(Collectors.toList()));
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java
index aecd8c1..ffe5c80 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dto/ToiletCleanLogDTO.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.dto;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.casic.missiles.core.base.json.DateDeserializer;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -71,6 +73,9 @@
     private String responsiblePersonTel;
 
     private BigDecimal area;
+
+    @JSONField(serializeUsing = DateDeserializer.class)
     private Timestamp startTime;
+
     private Timestamp endTime;
 }