diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
index 23f4612..4bb89ea 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
@@ -29,4 +29,6 @@
      * @return 结果集
      */
     List<JobRecordDTO> selectRecordsPage(@Param("page") Page<JobRecordDTO> page, @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
+
+    List<JobRecordDTO> selectRecords( @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
 }

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
index 23f4612..4bb89ea 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
@@ -29,4 +29,6 @@
      * @return 结果集
      */
     List<JobRecordDTO> selectRecordsPage(@Param("page") Page<JobRecordDTO> page, @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
+
+    List<JobRecordDTO> selectRecords( @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
index 60476b8..953dff7 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(@Param("scope") DataScope scope,@Param("page") Page<ToiletCleanLogDTO> page, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(@Param("scope") DataScope scope, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
 }

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
index 23f4612..4bb89ea 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
@@ -29,4 +29,6 @@
      * @return 结果集
      */
     List<JobRecordDTO> selectRecordsPage(@Param("page") Page<JobRecordDTO> page, @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
+
+    List<JobRecordDTO> selectRecords( @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
index 60476b8..953dff7 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(@Param("scope") DataScope scope,@Param("page") Page<ToiletCleanLogDTO> page, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(@Param("scope") DataScope scope, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
index a854ac4..2e068d9 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
@@ -45,5 +45,32 @@
         </where>
         order by b.CAR_CODE
     </select>
+    <select id="selectRecords" resultType="com.casic.missiles.modular.system.dto.JobRecordDTO">
+        SELECT
+        a.id,
+        a.ROUTE_ID AS 'routeId',
+        date_format(a.START_TIME, '%Y-%m-%d %H:%i:%s') AS 'startTime',
+        date_format(a.END_TIME, '%Y-%m-%d %H:%i:%s')  AS 'endTime',
+        c.type,
+        b.id AS carId,
+        b.CAR_CODE AS carCode,
+        b.DESCRIPTION AS carDescription,
+        b.DEPTID AS deptId,
+        b.USER_PERSON AS userPerson,
+        b.USER_PHONE AS userPersonPhone,
+        b.CHARGE_PERSON AS chargePerson,
+        b.CHARGE_PHONE AS chargePersonPhone,
+        c.ROUTE_NAME as ROUTENAME
+        FROM
+        ${sanitationBaseName}.dcms_car_job_record a
+        INNER JOIN ${carDataBaseName}.bus_car_info b ON a.CAR_ID = b.ID
+        INNER JOIN ${carDataBaseName}.bus_route_info c ON a.ROUTE_ID = c.ID
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by b.CAR_CODE
+    </select>
 
 </mapper>

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
index 23f4612..4bb89ea 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
@@ -29,4 +29,6 @@
      * @return 结果集
      */
     List<JobRecordDTO> selectRecordsPage(@Param("page") Page<JobRecordDTO> page, @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
+
+    List<JobRecordDTO> selectRecords( @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
index 60476b8..953dff7 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(@Param("scope") DataScope scope,@Param("page") Page<ToiletCleanLogDTO> page, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(@Param("scope") DataScope scope, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
index a854ac4..2e068d9 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
@@ -45,5 +45,32 @@
         </where>
         order by b.CAR_CODE
     </select>
+    <select id="selectRecords" resultType="com.casic.missiles.modular.system.dto.JobRecordDTO">
+        SELECT
+        a.id,
+        a.ROUTE_ID AS 'routeId',
+        date_format(a.START_TIME, '%Y-%m-%d %H:%i:%s') AS 'startTime',
+        date_format(a.END_TIME, '%Y-%m-%d %H:%i:%s')  AS 'endTime',
+        c.type,
+        b.id AS carId,
+        b.CAR_CODE AS carCode,
+        b.DESCRIPTION AS carDescription,
+        b.DEPTID AS deptId,
+        b.USER_PERSON AS userPerson,
+        b.USER_PHONE AS userPersonPhone,
+        b.CHARGE_PERSON AS chargePerson,
+        b.CHARGE_PHONE AS chargePersonPhone,
+        c.ROUTE_NAME as ROUTENAME
+        FROM
+        ${sanitationBaseName}.dcms_car_job_record a
+        INNER JOIN ${carDataBaseName}.bus_car_info b ON a.CAR_ID = b.ID
+        INNER JOIN ${carDataBaseName}.bus_route_info c ON a.ROUTE_ID = c.ID
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by b.CAR_CODE
+    </select>
 
 </mapper>
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
index 928a1f8..1af412f 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
@@ -47,5 +47,18 @@
         </where>
         order by a.CREATE_TIME desc
     </select>
+    <select id="selectJobRecord" resultType="com.casic.missiles.modular.system.dto.ToiletCleanLogDTO">
+        SELECT c.name, <include refid="Base_Column_List"/>,
+        <include refid="toilet_Column_List"/>
+        FROM ${sanitationBaseName}.dcms_toilet_clean_log a
+        INNER JOIN ${sanitationBaseName}.dcms_toilet b ON a.TOILET_ID = b.ID
+        INNER JOIN ${sanitationBaseName}.dcms_person c ON a.USER_ID = c.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by a.CREATE_TIME desc
+    </select>
 
 </mapper>

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
index 23f4612..4bb89ea 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
@@ -29,4 +29,6 @@
      * @return 结果集
      */
     List<JobRecordDTO> selectRecordsPage(@Param("page") Page<JobRecordDTO> page, @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
+
+    List<JobRecordDTO> selectRecords( @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
index 60476b8..953dff7 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(@Param("scope") DataScope scope,@Param("page") Page<ToiletCleanLogDTO> page, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(@Param("scope") DataScope scope, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
index a854ac4..2e068d9 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
@@ -45,5 +45,32 @@
         </where>
         order by b.CAR_CODE
     </select>
+    <select id="selectRecords" resultType="com.casic.missiles.modular.system.dto.JobRecordDTO">
+        SELECT
+        a.id,
+        a.ROUTE_ID AS 'routeId',
+        date_format(a.START_TIME, '%Y-%m-%d %H:%i:%s') AS 'startTime',
+        date_format(a.END_TIME, '%Y-%m-%d %H:%i:%s')  AS 'endTime',
+        c.type,
+        b.id AS carId,
+        b.CAR_CODE AS carCode,
+        b.DESCRIPTION AS carDescription,
+        b.DEPTID AS deptId,
+        b.USER_PERSON AS userPerson,
+        b.USER_PHONE AS userPersonPhone,
+        b.CHARGE_PERSON AS chargePerson,
+        b.CHARGE_PHONE AS chargePersonPhone,
+        c.ROUTE_NAME as ROUTENAME
+        FROM
+        ${sanitationBaseName}.dcms_car_job_record a
+        INNER JOIN ${carDataBaseName}.bus_car_info b ON a.CAR_ID = b.ID
+        INNER JOIN ${carDataBaseName}.bus_route_info c ON a.ROUTE_ID = c.ID
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by b.CAR_CODE
+    </select>
 
 </mapper>
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
index 928a1f8..1af412f 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
@@ -47,5 +47,18 @@
         </where>
         order by a.CREATE_TIME desc
     </select>
+    <select id="selectJobRecord" resultType="com.casic.missiles.modular.system.dto.ToiletCleanLogDTO">
+        SELECT c.name, <include refid="Base_Column_List"/>,
+        <include refid="toilet_Column_List"/>
+        FROM ${sanitationBaseName}.dcms_toilet_clean_log a
+        INNER JOIN ${sanitationBaseName}.dcms_toilet b ON a.TOILET_ID = b.ID
+        INNER JOIN ${sanitationBaseName}.dcms_person c ON a.USER_ID = c.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by a.CREATE_TIME desc
+    </select>
 
 </mapper>
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java
index 43f268c..02e986f 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(DataScope scope, Page<ToiletCleanLogDTO> page, EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(DataScope scope, EntityWrapper<ToiletCleanLogDTO> query);
 }

diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
index e1ea3c4..8d7b8e2 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/controller/CarJobExportController.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
-import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.datascope.DataScope;
@@ -16,9 +14,11 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,9 +46,6 @@
     @ResponseBody
     public void export(String type, String carCode, String routeName, String startTime, String endTime) {
 
-        Page<JobRecordDTO> page = new PageFactory<JobRecordDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
         EntityWrapper<JobRecordDTO> query = new EntityWrapper<>();
         DataScope scope = permissionService.getCurrUserDataScope();
         if (ToolUtil.isNotEmpty(type)) {
@@ -67,8 +64,11 @@
             query.le(JobConstant.END_TIME, endTime);
         }
 
-        List<JobRecordDTO> records = jobRecordService.selectRecordsPage(page, scope, query);
-        List<Object> objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        List<JobRecordDTO> records = jobRecordService.selectRecords(scope, query);
+        List<Object> objs = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(records)) {
+            objs = records.stream().map(jobRecordDTO -> (Object) jobRecordDTO).collect(Collectors.toList());
+        }
         exportExcel(JobRecordExportEnum.CAR_JOB_RECORD, objs);
     }
 
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
index 185c3a6..c30ebbb 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/IJobRecordService.java
@@ -27,4 +27,5 @@
      * @return 返回结果
      */
     List<JobRecordDTO> selectRecordsPage(Page<JobRecordDTO> page, DataScope scope, EntityWrapper<JobRecordDTO> query);
+    List<JobRecordDTO> selectRecords( DataScope scope, EntityWrapper<JobRecordDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
index 54b4c99..bc0fd03 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/job/service/impl/JobRecordServiceImpl.java
@@ -13,6 +13,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,4 +41,16 @@
         }
         return jobRecordDTOS;
     }
+
+    @Override
+    public List<JobRecordDTO> selectRecords(DataScope scope, EntityWrapper<JobRecordDTO> query) {
+        List<JobRecordDTO> jobRecordDTOS = this.baseMapper.selectRecords( scope, query);
+        if (ToolUtil.isNotEmpty(jobRecordDTOS)) {
+            jobRecordDTOS.stream().forEach(jobRecordDTO -> {
+                        jobRecordDTO.setDeptName(service.getDeptName(jobRecordDTO.getDeptId()));
+                    }
+            );
+        }
+        return jobRecordDTOS;
+    }
 }
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 ac684d9..ed484ac 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
@@ -2,11 +2,9 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.constant.JobConstant;
@@ -17,11 +15,13 @@
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -71,6 +71,26 @@
         return toiletCleanLogService.selectJobRecordPage(null, page, query);
     }
 
+    private List<ToiletCleanLogDTO> list(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
+        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
+        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);
+        }
+        return toiletCleanLogService.selectJobRecord(null, query);
+    }
+
     /**
      * 获取作业管理分页列表
      */
@@ -78,15 +98,17 @@
     @RequestMapping(value = "/exportJobRecord")
     @ResponseBody
     public void export(String name, String jobContent, String tolietKeywords, String startTime, String endTime) {
-        EntityWrapper<ToiletCleanLogDTO> query = new EntityWrapper<>();
-        Page<ToiletCleanLogDTO> page = new PageFactory<ToiletCleanLogDTO>().defaultPage();
-        page.setSearchCount(false);
-        page.setSize(Integer.MAX_VALUE);
-        List<ToiletCleanLogDTO> dtos = listPage(page, name, jobContent, tolietKeywords, startTime, endTime);
-        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, dtos.stream().map(toiletCleanLogDTO -> {
-            toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
-            return (Object) toiletCleanLogDTO;
-        }).collect(Collectors.toList()));
+        List<ToiletCleanLogDTO> dtos = list(name, jobContent, tolietKeywords, startTime, endTime);
+        List<Object> objs = new ArrayList<>();
+
+        if (!CollectionUtils.isEmpty(dtos)) {
+            objs = dtos.stream().map(toiletCleanLogDTO -> {
+                toiletCleanLogDTO.setStartTimeFmt(DateUtil.format(toiletCleanLogDTO.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
+                return (Object) toiletCleanLogDTO;
+            }).collect(Collectors.toList());
+        }
+        exportExcel(JobRecordExportEnum.TOILET_JOB_RECORD, objs);
+
     }
 
     /**
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
index 23f4612..4bb89ea 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/JobRecordMapper.java
@@ -29,4 +29,6 @@
      * @return 结果集
      */
     List<JobRecordDTO> selectRecordsPage(@Param("page") Page<JobRecordDTO> page, @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
+
+    List<JobRecordDTO> selectRecords( @Param("scope") DataScope scope, @Param("ew")EntityWrapper<JobRecordDTO> ew);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
index 60476b8..953dff7 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/ToiletCleanLogMapper.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(@Param("scope") DataScope scope,@Param("page") Page<ToiletCleanLogDTO> page, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(@Param("scope") DataScope scope, @Param("ew")EntityWrapper<ToiletCleanLogDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
index a854ac4..2e068d9 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/JobRecordMapper.xml
@@ -45,5 +45,32 @@
         </where>
         order by b.CAR_CODE
     </select>
+    <select id="selectRecords" resultType="com.casic.missiles.modular.system.dto.JobRecordDTO">
+        SELECT
+        a.id,
+        a.ROUTE_ID AS 'routeId',
+        date_format(a.START_TIME, '%Y-%m-%d %H:%i:%s') AS 'startTime',
+        date_format(a.END_TIME, '%Y-%m-%d %H:%i:%s')  AS 'endTime',
+        c.type,
+        b.id AS carId,
+        b.CAR_CODE AS carCode,
+        b.DESCRIPTION AS carDescription,
+        b.DEPTID AS deptId,
+        b.USER_PERSON AS userPerson,
+        b.USER_PHONE AS userPersonPhone,
+        b.CHARGE_PERSON AS chargePerson,
+        b.CHARGE_PHONE AS chargePersonPhone,
+        c.ROUTE_NAME as ROUTENAME
+        FROM
+        ${sanitationBaseName}.dcms_car_job_record a
+        INNER JOIN ${carDataBaseName}.bus_car_info b ON a.CAR_ID = b.ID
+        INNER JOIN ${carDataBaseName}.bus_route_info c ON a.ROUTE_ID = c.ID
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by b.CAR_CODE
+    </select>
 
 </mapper>
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
index 928a1f8..1af412f 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/dao/mapping/ToiletCleanLogMapper.xml
@@ -47,5 +47,18 @@
         </where>
         order by a.CREATE_TIME desc
     </select>
+    <select id="selectJobRecord" resultType="com.casic.missiles.modular.system.dto.ToiletCleanLogDTO">
+        SELECT c.name, <include refid="Base_Column_List"/>,
+        <include refid="toilet_Column_List"/>
+        FROM ${sanitationBaseName}.dcms_toilet_clean_log a
+        INNER JOIN ${sanitationBaseName}.dcms_toilet b ON a.TOILET_ID = b.ID
+        INNER JOIN ${sanitationBaseName}.dcms_person c ON a.USER_ID = c.id
+        <where>
+            <if test="ew != null">
+                ${ew.sqlSegment}
+            </if>
+        </where>
+        order by a.CREATE_TIME desc
+    </select>
 
 </mapper>
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java
index 43f268c..02e986f 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/IToiletCleanLogService.java
@@ -27,4 +27,5 @@
      * @return 结果集
      */
     List<ToiletCleanLogDTO> selectJobRecordPage(DataScope scope, Page<ToiletCleanLogDTO> page, EntityWrapper<ToiletCleanLogDTO> query);
+    List<ToiletCleanLogDTO> selectJobRecord(DataScope scope, EntityWrapper<ToiletCleanLogDTO> query);
 }
diff --git a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/impl/ToiletCleanLogServiceImpl.java b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/impl/ToiletCleanLogServiceImpl.java
index 1fccf90..7527986 100644
--- a/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/impl/ToiletCleanLogServiceImpl.java
+++ b/casic-service-job-monitor/src/main/java/com/casic/missiles/modular/system/service/impl/ToiletCleanLogServiceImpl.java
@@ -34,4 +34,8 @@
     public List<ToiletCleanLogDTO> selectJobRecordPage(DataScope scope, Page<ToiletCleanLogDTO> page, EntityWrapper<ToiletCleanLogDTO> query) {
         return this.baseMapper.selectJobRecordPage(scope,page,query);
     }
+    @Override
+    public List<ToiletCleanLogDTO> selectJobRecord(DataScope scope, EntityWrapper<ToiletCleanLogDTO> query) {
+        return this.baseMapper.selectJobRecord(scope,query);
+    }
 }