diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 66a414b..50d1c6d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,19 +1,18 @@
 package com.casic.missiles.service.Impl.business;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.HandOutLabExecutiveDTO;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
-import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessOrderMapper;
-import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
-import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.mapper.business.*;
+import com.casic.missiles.model.business.*;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,24 +22,80 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 @AllArgsConstructor
 public class IBusinessDispatchServiceImpl extends ServiceImpl<BusinessOrderSampleRelationMapper, BusinessOrderSampleRelation> implements IBusinessDispatchService {
 
+    private final BusinessOrderSampleRelationMapper orderSampleRelationMapper;
+    private final BusinessLabExecutiveOperateLogMapper labExecutiveOperateLogMapper;
+    private final BusinessCertificateReportMapper certificateReportMapper;
+    private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper;
 
     //终止、回退、收入、归还、催办按钮
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
-//        Page<DeviceDispatchVO>  deviceDispatchVOPage=P
 //        //查询委托书和样品关联表中的各状态的样品
-//        Page<SampleHandOutListResponse> handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest);
-//        log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus());
-//        List<SampleHandOutListResponse> records = handOutList.getRecords();
-//        if(CollectionUtils.isEmpty(records)){
-//            return new Page<>();
-//        }
+        Page<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
+        log.info("设备收发-当前查询样品状态为：{}", request.getSampleStatus());
+        List<DeviceDispatchVO> records = dispatchVOPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return new Page<>();
+        }
+//        dispatchVOPage.getRecords().stream().forEach(
+//                dispatchVO -> {
+//                    Long orderId = dispatchVO.getOrderId();
+//                    Long sampleId = dispatchVO.getSampleId();
+//                    String sampleStatus = dispatchVO.getSampleStatus();
+//                    switch (sampleStatus) {
+//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.TO_HANDOUT:
+//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
+//                                dispatchVO.setFallbackState(0);
+//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+//                            } else {
+//                                dispatchVO.setFallbackState(1);
+//                                dispatchVO.setAlreadyCertifications(0);
+//                            }
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                            break;
+//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+//                        case SampleStatusEnum.IN_MEASURE:
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.MEASURE_COMPLETE:
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
+//                            break;
+//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+//                        case SampleStatusEnum.BE_OVERDUE:
+//                            //待分发的超期
+//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
+//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                                break;
+//                            }
+//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
+//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                    }
+//                }
+//        );
         return page;
     }
 
@@ -84,4 +139,38 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
+        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
+        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        return wrapper;
+    }
+
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+        Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
+        return aLong.intValue();
+    }
+
+    private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
+        List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
+        if (CollectionUtils.isEmpty(labExecutiveList)) {
+            log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
+            return null;
+        }
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
+        return handOutLabExecutiveDTO;
+    }
+
+    private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
+        QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", dispatchVO.getOrderId());
+        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("measure_dept_id", deptId);
+        return wrapper;
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 66a414b..50d1c6d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,19 +1,18 @@
 package com.casic.missiles.service.Impl.business;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.HandOutLabExecutiveDTO;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
-import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessOrderMapper;
-import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
-import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.mapper.business.*;
+import com.casic.missiles.model.business.*;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,24 +22,80 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 @AllArgsConstructor
 public class IBusinessDispatchServiceImpl extends ServiceImpl<BusinessOrderSampleRelationMapper, BusinessOrderSampleRelation> implements IBusinessDispatchService {
 
+    private final BusinessOrderSampleRelationMapper orderSampleRelationMapper;
+    private final BusinessLabExecutiveOperateLogMapper labExecutiveOperateLogMapper;
+    private final BusinessCertificateReportMapper certificateReportMapper;
+    private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper;
 
     //终止、回退、收入、归还、催办按钮
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
-//        Page<DeviceDispatchVO>  deviceDispatchVOPage=P
 //        //查询委托书和样品关联表中的各状态的样品
-//        Page<SampleHandOutListResponse> handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest);
-//        log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus());
-//        List<SampleHandOutListResponse> records = handOutList.getRecords();
-//        if(CollectionUtils.isEmpty(records)){
-//            return new Page<>();
-//        }
+        Page<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
+        log.info("设备收发-当前查询样品状态为：{}", request.getSampleStatus());
+        List<DeviceDispatchVO> records = dispatchVOPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return new Page<>();
+        }
+//        dispatchVOPage.getRecords().stream().forEach(
+//                dispatchVO -> {
+//                    Long orderId = dispatchVO.getOrderId();
+//                    Long sampleId = dispatchVO.getSampleId();
+//                    String sampleStatus = dispatchVO.getSampleStatus();
+//                    switch (sampleStatus) {
+//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.TO_HANDOUT:
+//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
+//                                dispatchVO.setFallbackState(0);
+//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+//                            } else {
+//                                dispatchVO.setFallbackState(1);
+//                                dispatchVO.setAlreadyCertifications(0);
+//                            }
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                            break;
+//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+//                        case SampleStatusEnum.IN_MEASURE:
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.MEASURE_COMPLETE:
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
+//                            break;
+//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+//                        case SampleStatusEnum.BE_OVERDUE:
+//                            //待分发的超期
+//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
+//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                                break;
+//                            }
+//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
+//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                    }
+//                }
+//        );
         return page;
     }
 
@@ -84,4 +139,38 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
+        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
+        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        return wrapper;
+    }
+
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+        Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
+        return aLong.intValue();
+    }
+
+    private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
+        List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
+        if (CollectionUtils.isEmpty(labExecutiveList)) {
+            log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
+            return null;
+        }
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
+        return handOutLabExecutiveDTO;
+    }
+
+    private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
+        QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", dispatchVO.getOrderId());
+        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("measure_dept_id", deptId);
+        return wrapper;
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index ee04e7b..938d725 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -20,6 +21,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -79,8 +81,13 @@
     @Override
     public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
-            List<CustomerAdviceInfo> customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            List<CustomerAdviceInfo> customerAdviceList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
+                customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 66a414b..50d1c6d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,19 +1,18 @@
 package com.casic.missiles.service.Impl.business;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.HandOutLabExecutiveDTO;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
-import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessOrderMapper;
-import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
-import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.mapper.business.*;
+import com.casic.missiles.model.business.*;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,24 +22,80 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 @AllArgsConstructor
 public class IBusinessDispatchServiceImpl extends ServiceImpl<BusinessOrderSampleRelationMapper, BusinessOrderSampleRelation> implements IBusinessDispatchService {
 
+    private final BusinessOrderSampleRelationMapper orderSampleRelationMapper;
+    private final BusinessLabExecutiveOperateLogMapper labExecutiveOperateLogMapper;
+    private final BusinessCertificateReportMapper certificateReportMapper;
+    private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper;
 
     //终止、回退、收入、归还、催办按钮
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
-//        Page<DeviceDispatchVO>  deviceDispatchVOPage=P
 //        //查询委托书和样品关联表中的各状态的样品
-//        Page<SampleHandOutListResponse> handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest);
-//        log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus());
-//        List<SampleHandOutListResponse> records = handOutList.getRecords();
-//        if(CollectionUtils.isEmpty(records)){
-//            return new Page<>();
-//        }
+        Page<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
+        log.info("设备收发-当前查询样品状态为：{}", request.getSampleStatus());
+        List<DeviceDispatchVO> records = dispatchVOPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return new Page<>();
+        }
+//        dispatchVOPage.getRecords().stream().forEach(
+//                dispatchVO -> {
+//                    Long orderId = dispatchVO.getOrderId();
+//                    Long sampleId = dispatchVO.getSampleId();
+//                    String sampleStatus = dispatchVO.getSampleStatus();
+//                    switch (sampleStatus) {
+//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.TO_HANDOUT:
+//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
+//                                dispatchVO.setFallbackState(0);
+//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+//                            } else {
+//                                dispatchVO.setFallbackState(1);
+//                                dispatchVO.setAlreadyCertifications(0);
+//                            }
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                            break;
+//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+//                        case SampleStatusEnum.IN_MEASURE:
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.MEASURE_COMPLETE:
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
+//                            break;
+//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+//                        case SampleStatusEnum.BE_OVERDUE:
+//                            //待分发的超期
+//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
+//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                                break;
+//                            }
+//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
+//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                    }
+//                }
+//        );
         return page;
     }
 
@@ -84,4 +139,38 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
+        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
+        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        return wrapper;
+    }
+
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+        Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
+        return aLong.intValue();
+    }
+
+    private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
+        List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
+        if (CollectionUtils.isEmpty(labExecutiveList)) {
+            log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
+            return null;
+        }
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
+        return handOutLabExecutiveDTO;
+    }
+
+    private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
+        QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", dispatchVO.getOrderId());
+        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("measure_dept_id", deptId);
+        return wrapper;
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index ee04e7b..938d725 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -20,6 +21,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -79,8 +81,13 @@
     @Override
     public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
-            List<CustomerAdviceInfo> customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            List<CustomerAdviceInfo> customerAdviceList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
+                customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index dec41f1..c4f6cb8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -53,11 +54,13 @@
         QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
         Page<CustomerSampleListResponse> customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper);
         customerSamplePage.getRecords().stream()
-                .forEach(customerSample ->{
-                    BusinessOrderSampleRelation businessOrderSampleRelation=this.getSampleStatusById(customerSample.getId());
-                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
-                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
-                 });
+                .forEach(customerSample -> {
+                    BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                        customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                        customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                    }
+                });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
             if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) {
                 DictCodeUtils.convertDictCodeToName(customerSampleListResponse);
@@ -99,23 +102,33 @@
     }
 
     /**
-     *  只导出样品列表信息
+     * 只导出样品列表信息
+     *
      * @param request
      * @param response
      */
     @Override
     public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
-            List<CustomerSampleListResponse> customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
-            Map<String, String> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> String.valueOf(e.getOrderId() + e.getSampleId()), BusinessOrderSampleRelation::getSampleStatus));
+            Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
+                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
+                            ( value1,value2) ->value1));
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
+                customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            }
             customerSampleList.stream().filter(customerSample -> !ObjectUtils.isEmpty(customerSample.getOrderId()))
                     .forEach(
                             customerSample -> {
-                                String orderSampleIdKey = String.valueOf(customerSample.getOrderId() + customerSample.getId());
-                                customerSample.setSampleSatus(businessOrderMap.containsKey(orderSampleIdKey) ? businessOrderMap.get(orderSampleIdKey) : "");
+                                BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId());
+                                if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                                }
                             }
                     );
             for (CustomerSampleListResponse customerSampleListResponse : customerSampleList) {
@@ -161,7 +174,7 @@
                 .orderByDesc("create_time");
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(wrapper);
         Optional<BusinessOrderSampleRelation> orderSampleOptional = orderSampleList.stream().findFirst();
-        return orderSampleOptional.isPresent() ? orderSampleOptional.get(): null;
+        return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
     private void initSample(CustomerSampleInfo customerSampleInfo) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 66a414b..50d1c6d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,19 +1,18 @@
 package com.casic.missiles.service.Impl.business;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.HandOutLabExecutiveDTO;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
-import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessOrderMapper;
-import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
-import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.mapper.business.*;
+import com.casic.missiles.model.business.*;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,24 +22,80 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 @AllArgsConstructor
 public class IBusinessDispatchServiceImpl extends ServiceImpl<BusinessOrderSampleRelationMapper, BusinessOrderSampleRelation> implements IBusinessDispatchService {
 
+    private final BusinessOrderSampleRelationMapper orderSampleRelationMapper;
+    private final BusinessLabExecutiveOperateLogMapper labExecutiveOperateLogMapper;
+    private final BusinessCertificateReportMapper certificateReportMapper;
+    private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper;
 
     //终止、回退、收入、归还、催办按钮
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
-//        Page<DeviceDispatchVO>  deviceDispatchVOPage=P
 //        //查询委托书和样品关联表中的各状态的样品
-//        Page<SampleHandOutListResponse> handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest);
-//        log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus());
-//        List<SampleHandOutListResponse> records = handOutList.getRecords();
-//        if(CollectionUtils.isEmpty(records)){
-//            return new Page<>();
-//        }
+        Page<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
+        log.info("设备收发-当前查询样品状态为：{}", request.getSampleStatus());
+        List<DeviceDispatchVO> records = dispatchVOPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return new Page<>();
+        }
+//        dispatchVOPage.getRecords().stream().forEach(
+//                dispatchVO -> {
+//                    Long orderId = dispatchVO.getOrderId();
+//                    Long sampleId = dispatchVO.getSampleId();
+//                    String sampleStatus = dispatchVO.getSampleStatus();
+//                    switch (sampleStatus) {
+//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.TO_HANDOUT:
+//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
+//                                dispatchVO.setFallbackState(0);
+//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+//                            } else {
+//                                dispatchVO.setFallbackState(1);
+//                                dispatchVO.setAlreadyCertifications(0);
+//                            }
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                            break;
+//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+//                        case SampleStatusEnum.IN_MEASURE:
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.MEASURE_COMPLETE:
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
+//                            break;
+//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+//                        case SampleStatusEnum.BE_OVERDUE:
+//                            //待分发的超期
+//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
+//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                                break;
+//                            }
+//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
+//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                    }
+//                }
+//        );
         return page;
     }
 
@@ -84,4 +139,38 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
+        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
+        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        return wrapper;
+    }
+
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+        Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
+        return aLong.intValue();
+    }
+
+    private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
+        List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
+        if (CollectionUtils.isEmpty(labExecutiveList)) {
+            log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
+            return null;
+        }
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
+        return handOutLabExecutiveDTO;
+    }
+
+    private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
+        QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", dispatchVO.getOrderId());
+        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("measure_dept_id", deptId);
+        return wrapper;
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index ee04e7b..938d725 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -20,6 +21,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -79,8 +81,13 @@
     @Override
     public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
-            List<CustomerAdviceInfo> customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            List<CustomerAdviceInfo> customerAdviceList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
+                customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index dec41f1..c4f6cb8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -53,11 +54,13 @@
         QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
         Page<CustomerSampleListResponse> customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper);
         customerSamplePage.getRecords().stream()
-                .forEach(customerSample ->{
-                    BusinessOrderSampleRelation businessOrderSampleRelation=this.getSampleStatusById(customerSample.getId());
-                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
-                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
-                 });
+                .forEach(customerSample -> {
+                    BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                        customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                        customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                    }
+                });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
             if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) {
                 DictCodeUtils.convertDictCodeToName(customerSampleListResponse);
@@ -99,23 +102,33 @@
     }
 
     /**
-     *  只导出样品列表信息
+     * 只导出样品列表信息
+     *
      * @param request
      * @param response
      */
     @Override
     public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
-            List<CustomerSampleListResponse> customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
-            Map<String, String> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> String.valueOf(e.getOrderId() + e.getSampleId()), BusinessOrderSampleRelation::getSampleStatus));
+            Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
+                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
+                            ( value1,value2) ->value1));
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
+                customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            }
             customerSampleList.stream().filter(customerSample -> !ObjectUtils.isEmpty(customerSample.getOrderId()))
                     .forEach(
                             customerSample -> {
-                                String orderSampleIdKey = String.valueOf(customerSample.getOrderId() + customerSample.getId());
-                                customerSample.setSampleSatus(businessOrderMap.containsKey(orderSampleIdKey) ? businessOrderMap.get(orderSampleIdKey) : "");
+                                BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId());
+                                if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                                }
                             }
                     );
             for (CustomerSampleListResponse customerSampleListResponse : customerSampleList) {
@@ -161,7 +174,7 @@
                 .orderByDesc("create_time");
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(wrapper);
         Optional<BusinessOrderSampleRelation> orderSampleOptional = orderSampleList.stream().findFirst();
-        return orderSampleOptional.isPresent() ? orderSampleOptional.get(): null;
+        return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
     private void initSample(CustomerSampleInfo customerSampleInfo) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index 6b05b67..85918e9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -56,6 +57,16 @@
     }
 
     @Override
+    public List<CustomerInfoResponse> customerList( CustomerListRequest request) throws Exception {
+        QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
+        List<CustomerInfoResponse> resultList = customerInfoResponseMapper.selectList(wrapper);
+        for (CustomerInfoResponse customerInfo : resultList) {
+            DictCodeUtils.convertDictCodeToName(customerInfo);
+        }
+        return resultList;
+    }
+
+    @Override
     @Transactional
     public ReturnDTO addCustomer(CustomerInfo customerInfo) {
         initCustomerInfo(customerInfo);
@@ -72,8 +83,9 @@
     public ReturnDTO updateCustomer(CustomerInfo customerInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerInfo.setUpdateUser(authUser.getId());
+        userInfoListDeletor(customerInfo.getId());
         Integer updateFlag = this.baseMapper.updateById(customerInfo);
-        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList());
+        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -89,7 +101,9 @@
 
     @Override
     public ReturnDTO deleteCustomer(Long id) {
+        CustomerInfo customerInfo = this.baseMapper.selectById(id);
         Integer deleteFlag = this.baseMapper.deleteById(id);
+        userInfoListDeletor(customerInfo.getId());
         if (deleteFlag > 0) {
             return ReturnUtil.success();
         }
@@ -110,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -133,8 +146,13 @@
     @Override
     public void customerExport(CustomerListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-            List<CustomerInfoResponse> customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+            List<CustomerInfoResponse> customerInfoList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
+            }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
             }
@@ -150,7 +168,8 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
+        queryWrapper.eq("is_del", 0);
         return queryWrapper;
     }
 
@@ -170,10 +189,18 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
+    }
+
+
+    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList,Long id) {
         Boolean userUpdateFlag = true;
         for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
+            customerUserInfo.setCustomerId(id);
+            Integer userUpdateNum = customerUserMapper.insert(customerUserInfo);
             if (userUpdateNum <= 0) {
                 userUpdateFlag = false;
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 66a414b..50d1c6d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,19 +1,18 @@
 package com.casic.missiles.service.Impl.business;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.HandOutLabExecutiveDTO;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
-import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessOrderMapper;
-import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
-import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.mapper.business.*;
+import com.casic.missiles.model.business.*;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,24 +22,80 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 @AllArgsConstructor
 public class IBusinessDispatchServiceImpl extends ServiceImpl<BusinessOrderSampleRelationMapper, BusinessOrderSampleRelation> implements IBusinessDispatchService {
 
+    private final BusinessOrderSampleRelationMapper orderSampleRelationMapper;
+    private final BusinessLabExecutiveOperateLogMapper labExecutiveOperateLogMapper;
+    private final BusinessCertificateReportMapper certificateReportMapper;
+    private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper;
 
     //终止、回退、收入、归还、催办按钮
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
-//        Page<DeviceDispatchVO>  deviceDispatchVOPage=P
 //        //查询委托书和样品关联表中的各状态的样品
-//        Page<SampleHandOutListResponse> handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest);
-//        log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus());
-//        List<SampleHandOutListResponse> records = handOutList.getRecords();
-//        if(CollectionUtils.isEmpty(records)){
-//            return new Page<>();
-//        }
+        Page<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
+        log.info("设备收发-当前查询样品状态为：{}", request.getSampleStatus());
+        List<DeviceDispatchVO> records = dispatchVOPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return new Page<>();
+        }
+//        dispatchVOPage.getRecords().stream().forEach(
+//                dispatchVO -> {
+//                    Long orderId = dispatchVO.getOrderId();
+//                    Long sampleId = dispatchVO.getSampleId();
+//                    String sampleStatus = dispatchVO.getSampleStatus();
+//                    switch (sampleStatus) {
+//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.TO_HANDOUT:
+//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
+//                                dispatchVO.setFallbackState(0);
+//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+//                            } else {
+//                                dispatchVO.setFallbackState(1);
+//                                dispatchVO.setAlreadyCertifications(0);
+//                            }
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                            break;
+//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+//                        case SampleStatusEnum.IN_MEASURE:
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.MEASURE_COMPLETE:
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
+//                            break;
+//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+//                        case SampleStatusEnum.BE_OVERDUE:
+//                            //待分发的超期
+//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
+//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                                break;
+//                            }
+//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
+//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                    }
+//                }
+//        );
         return page;
     }
 
@@ -84,4 +139,38 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
+        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
+        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        return wrapper;
+    }
+
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+        Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
+        return aLong.intValue();
+    }
+
+    private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
+        List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
+        if (CollectionUtils.isEmpty(labExecutiveList)) {
+            log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
+            return null;
+        }
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
+        return handOutLabExecutiveDTO;
+    }
+
+    private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
+        QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", dispatchVO.getOrderId());
+        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("measure_dept_id", deptId);
+        return wrapper;
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index ee04e7b..938d725 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -20,6 +21,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -79,8 +81,13 @@
     @Override
     public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
-            List<CustomerAdviceInfo> customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            List<CustomerAdviceInfo> customerAdviceList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
+                customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index dec41f1..c4f6cb8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -53,11 +54,13 @@
         QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
         Page<CustomerSampleListResponse> customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper);
         customerSamplePage.getRecords().stream()
-                .forEach(customerSample ->{
-                    BusinessOrderSampleRelation businessOrderSampleRelation=this.getSampleStatusById(customerSample.getId());
-                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
-                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
-                 });
+                .forEach(customerSample -> {
+                    BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                        customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                        customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                    }
+                });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
             if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) {
                 DictCodeUtils.convertDictCodeToName(customerSampleListResponse);
@@ -99,23 +102,33 @@
     }
 
     /**
-     *  只导出样品列表信息
+     * 只导出样品列表信息
+     *
      * @param request
      * @param response
      */
     @Override
     public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
-            List<CustomerSampleListResponse> customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
-            Map<String, String> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> String.valueOf(e.getOrderId() + e.getSampleId()), BusinessOrderSampleRelation::getSampleStatus));
+            Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
+                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
+                            ( value1,value2) ->value1));
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
+                customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            }
             customerSampleList.stream().filter(customerSample -> !ObjectUtils.isEmpty(customerSample.getOrderId()))
                     .forEach(
                             customerSample -> {
-                                String orderSampleIdKey = String.valueOf(customerSample.getOrderId() + customerSample.getId());
-                                customerSample.setSampleSatus(businessOrderMap.containsKey(orderSampleIdKey) ? businessOrderMap.get(orderSampleIdKey) : "");
+                                BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId());
+                                if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                                }
                             }
                     );
             for (CustomerSampleListResponse customerSampleListResponse : customerSampleList) {
@@ -161,7 +174,7 @@
                 .orderByDesc("create_time");
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(wrapper);
         Optional<BusinessOrderSampleRelation> orderSampleOptional = orderSampleList.stream().findFirst();
-        return orderSampleOptional.isPresent() ? orderSampleOptional.get(): null;
+        return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
     private void initSample(CustomerSampleInfo customerSampleInfo) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index 6b05b67..85918e9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -56,6 +57,16 @@
     }
 
     @Override
+    public List<CustomerInfoResponse> customerList( CustomerListRequest request) throws Exception {
+        QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
+        List<CustomerInfoResponse> resultList = customerInfoResponseMapper.selectList(wrapper);
+        for (CustomerInfoResponse customerInfo : resultList) {
+            DictCodeUtils.convertDictCodeToName(customerInfo);
+        }
+        return resultList;
+    }
+
+    @Override
     @Transactional
     public ReturnDTO addCustomer(CustomerInfo customerInfo) {
         initCustomerInfo(customerInfo);
@@ -72,8 +83,9 @@
     public ReturnDTO updateCustomer(CustomerInfo customerInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerInfo.setUpdateUser(authUser.getId());
+        userInfoListDeletor(customerInfo.getId());
         Integer updateFlag = this.baseMapper.updateById(customerInfo);
-        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList());
+        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -89,7 +101,9 @@
 
     @Override
     public ReturnDTO deleteCustomer(Long id) {
+        CustomerInfo customerInfo = this.baseMapper.selectById(id);
         Integer deleteFlag = this.baseMapper.deleteById(id);
+        userInfoListDeletor(customerInfo.getId());
         if (deleteFlag > 0) {
             return ReturnUtil.success();
         }
@@ -110,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -133,8 +146,13 @@
     @Override
     public void customerExport(CustomerListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-            List<CustomerInfoResponse> customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+            List<CustomerInfoResponse> customerInfoList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
+            }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
             }
@@ -150,7 +168,8 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
+        queryWrapper.eq("is_del", 0);
         return queryWrapper;
     }
 
@@ -170,10 +189,18 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
+    }
+
+
+    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList,Long id) {
         Boolean userUpdateFlag = true;
         for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
+            customerUserInfo.setCustomerId(id);
+            Integer userUpdateNum = customerUserMapper.insert(customerUserInfo);
             if (userUpdateNum <= 0) {
                 userUpdateFlag = false;
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
index 5bc1307..de26f89 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
@@ -18,7 +20,8 @@
  * @since 2023-02-02
  */
 public interface IBusinessEnvironmentRecordService extends IService<BusinessEnvironmentRecord> {
-    Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception;
+
+    Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception;
 
     BusinessEnvironmentRecord environmentDetail(Long id);
 
@@ -28,6 +31,8 @@
 
     ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord);
 
-    void environmentExport(OrderListRequest request, HttpServletResponse response);
+    void environmentExport(EnvironmentListRequest request, HttpServletResponse response);
+
 
 }
+

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
index a7cc37b..dc5e97a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java
@@ -36,6 +36,10 @@
 
     private IBusinessDispatchService bizDispatchService;
 
+    /**
+     * 除了ui界面要展示的列在DeviceDispatchDTO模型中体现以外，还需覆盖所有按钮的权限操作，终止、回退、收入、归还、催办按钮
+     * 这些是列表实现的详细点
+     */
     @ApiOperation("设备列表-分页(终止、回退、收入、归还、催办按钮)")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<DeviceDispatchVO>> listPage(@RequestBody @Valid DeviceDispatchDTO request, BindingResult bindingResult) throws Exception {
@@ -46,12 +50,18 @@
         return ReturnUtil.success(super.packForBT(bizDispatchService.listPage(page, request)));
     }
 
+    /**
+     * 列表的导出
+     */
     @ApiOperation("样品导出")
     @PostMapping("/export")
-    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response){
+    public void exportSampleDispatchList(@RequestBody @Valid DeviceDispatchDTO request, HttpServletResponse response) {
         bizDispatchService.exportSampleDispatchList(request, response);
     }
 
+    /**
+     * 手动收入
+     */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
     public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -61,6 +71,9 @@
         return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
     }
 
+    /**
+     * 直接回填状态即可
+     */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
     public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
@@ -70,6 +83,9 @@
         return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
     }
 
+    /**
+     * 设备终止，同时要进行终止原因的回填
+     */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
     public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
@@ -79,7 +95,9 @@
         return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
     }
 
-
+    /**
+     * 催办会产生催办消息，对相关操作人员进行消息提示
+     */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
     public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
index 53c9774..99e3b8f 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessEnvironmentRecordController.java
@@ -1,13 +1,18 @@
 package com.casic.missiles.controller.business;
 
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.application.service.AbstractDictService;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.core.page.PageInfoBT;
 import com.casic.missiles.dto.IdDTO;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
-import com.casic.missiles.dto.business.order.OrderListReponse;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.MeterDictEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
@@ -20,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.Objects;
 
@@ -28,7 +34,7 @@
  * 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author zt
  * @since 2023-02-02
  */
 @RestController
@@ -37,19 +43,23 @@
 
     @Resource
     private IBusinessEnvironmentRecordService businessEnvironmentRecordService;
-//    @ApiOperation("环境检测单查询")
-//    @PostMapping("/listPage")
-//    public ReturnDTO<PageInfoBT<OrderListReponse>> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception {
-//        if (bindingResult.hasErrors()) {
-//            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
-//        }
-//        Page<OrderListReponse> page = PageFactory.defaultPage();
-//        return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request)));
-//    }
-//
+    @Resource
+    private AbstractDictService dictService;
+
+    @ApiOperation("环境检测单查询")
+    @PostMapping("/listPage")
+    public ReturnDTO<PageInfoBT<EnvironmentListResponse>> environmentListPage(@RequestBody @Valid EnvironmentListRequest request, BindingResult bindingResult) throws Exception {
+        Assert.isFalse(bindingResult.hasErrors(), () -> {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        });
+        Page<EnvironmentListResponse> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(businessEnvironmentRecordService.environmentListPage(page, request)));
+    }
+
+
     @ApiOperation("环境检测单详情")
     @PostMapping("/detail")
-    public ReturnDTO<BusinessEnvironmentRecord> adviceDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessEnvironmentRecord> environmentDetail(@RequestBody @Valid IdDTO idDTO) {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -58,7 +68,7 @@
 
     @ApiOperation("环境检测单更新")
     @PostMapping("/update")
-    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord  businessEnvironmentRecord, BindingResult bindingResult){
+    public ReturnDTO updateAdvice(@RequestBody @Valid BusinessEnvironmentRecord businessEnvironmentRecord, BindingResult bindingResult) {
         Assert.isFalse(Objects.isNull(businessEnvironmentRecord.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
@@ -83,14 +93,18 @@
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
+
         return ReturnUtil.success(businessEnvironmentRecordService.deleteEnvironment(idDTO.getId()));
     }
-//
-//    //*******************************************************************************************************************//
-//    @ApiOperation("环境检测单导出")
-//    @PostMapping("/export")
-//    public void exportAdvice(@RequestBody @Valid OrderListRequest request, HttpServletResponse response) {
-//        businessOrderService.orderExport(request, response);
-//    }
 
+    @ApiOperation("环境检测单导出")
+    @PostMapping("/export")
+    public void exportEnvironment(@RequestBody @Valid EnvironmentListRequest request, HttpServletResponse response) {
+        businessEnvironmentRecordService.environmentExport(request, response);
+    }
+    @ApiOperation("获取房间号")//业务表
+    @PostMapping("/getDoors")
+    public ReturnDTO getDoors() {
+        return ReturnUtil.success(dictService.findInDictByCode(MeterDictEnum.DOOR_NUMBER));
+    }
 }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index 7d5e4a0..36f3c61 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -27,6 +27,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "客户基础信息模块")
@@ -37,7 +38,7 @@
 
     private final CustomerService customerService;
 
-    @ApiOperation("客户基本信息列表")
+    @ApiOperation("客户基本信息分页列表")
     @PostMapping("/listPage")
     public ReturnDTO<PageInfoBT<CustomerInfoResponse>> listPage(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
@@ -47,6 +48,15 @@
         return ReturnUtil.success(super.packForBT(customerService.listPage(page, request)));
     }
 
+    @ApiOperation("客户基本信息不分页列表")
+    @PostMapping("/list")
+    public ReturnDTO<List<CustomerInfoResponse>> customerList(@RequestBody @Valid CustomerListRequest request, BindingResult bindingResult) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
+        return ReturnUtil.success(customerService.customerList(request));
+    }
+
     @ApiOperation("客户新增")
     @PostMapping("/add")
     public ReturnDTO addCustomer(@RequestBody @Valid CustomerInfo customerInfo, BindingResult bindingResult) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
index 3e4f307..83b9856 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExportEnum.java
@@ -33,6 +33,7 @@
     ORDER_EXPORT("orderData", "orderData", "委托书信息"),
     SAMPLE_EXPORT("sampleData", "sampleData", "样本信息"),
     EXCHANGE_DATA("exchangeData", "exchangeData", "设备交接单"),
+    ENVIRONMENT_DATA("environmentData", "environmentData", "环境记录单"),
     ADVICE_EXPORT("adviceData", "adviceData", "客户反馈");
 
     ExportEnum(String fileName, String sheetName, String description) {
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
index b507dde..5253767 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/MeterDictEnum.java
@@ -30,8 +30,7 @@
     String DIRECTOR_DISCOUNT_PERMISSION = "directorDiscountPermission";
     //标准装置-申请类型
     String STANDARD_APPLY_TYPE = "standardApplyType";
-    //标准装置-状态
-    String STANDARD_MANAGER_STATE = "standardManagerState";
-    //测量设备-状态
-    String MANAGER_STATE = "managerState";
+    //房间号
+    String DOOR_NUMBER = "doorCode";
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
new file mode 100644
index 0000000..5057d08
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java
@@ -0,0 +1,14 @@
+package com.casic.missiles.enums;
+
+/**
+ * @Description: 生成编号前缀枚举
+ * @Author: zt
+ * @Date: 2023/2/13 15:41
+ */
+public interface PrefixCodeEnum {
+
+        //环境记录单编号生成前缀
+       String ENVIRONMENT_PREFIX = "hjld";
+
+
+}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
index e838f36..18ab69f 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/CounterSignListener.java
@@ -131,7 +131,7 @@
                     String id = String.valueOf(idMap.get("id"));
                     assigneeList.add(id);
                 } else if (AssigneeSetTypeEnum.SELF_SELECT == settype) {
-                    //发起人自选审批人(需求暂无此功能)
+                    // TODO: 2022/12/27 发起人自选审批人(需求暂无此功能)
 
                 } else if (AssigneeSetTypeEnum.SELF == settype) {
                     //启动流程时设置的发起人全局变量
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
deleted file mode 100644
index fa11713..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnviromentRecordMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.casic.missiles.mapper.business;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author wangpeng
- * @since 2023-02-02
- */
-public interface BusinessEnviromentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
-    @Select("SELECT IFNULL(max(RIGHT(order_code, 12)), 0) from  business_order")
-    Long selectMaxCode();
-}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
new file mode 100644
index 0000000..a651c40
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessEnvironmentRecordMapper.java
@@ -0,0 +1,19 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.model.business.BusinessEnvironmentRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wangpeng
+ * @since 2023-02-02
+ */
+public interface BusinessEnvironmentRecordMapper extends BaseMapper<BusinessEnvironmentRecord> {
+    @Select("SELECT IFNULL(max(RIGHT(environment_code, 12)), 0) from  business_environment_record")
+    Long selectMaxCode();
+
+}
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
new file mode 100644
index 0000000..7f16692
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java
@@ -0,0 +1,10 @@
+
+
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
+
+public interface BusinessInterchangeListResponseMapper  extends BaseMapper<InterchangeListResponse> {
+}
+
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
index dad016b..ecc1669 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java
@@ -6,6 +6,8 @@
 import com.casic.missiles.dto.business.SampleHandOutListRequest;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.SampleHandOutDetailRequest;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
+import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,5 +23,7 @@
 
     Page<SampleHandOutListResponse> selectSampleListByStatus(Page<SampleHandOutListResponse> page, @Param("request") SampleHandOutListRequest request);
 
+    Page<DeviceDispatchVO> getSampleListByStatus(@Param("page") Page<DeviceDispatchVO> page, @Param("request") DeviceDispatchDTO request);
+
     SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request);
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
new file mode 100644
index 0000000..884b482
--- /dev/null
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/EnvironmentListResponseMapper.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.mapper.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zt
+ * @since 2023-02-02
+ */
+public interface EnvironmentListResponseMapper extends BaseMapper<EnvironmentListResponse> {
+
+
+}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
index e80a3ad..14eeb73 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessEnviromentRecordMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper">
+<mapper namespace="com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessEnvironmentRecord">
@@ -20,6 +20,7 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
 
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, environment_code, room_number, recorder, record_time, temperature, humidity, output_voltage, zero_ground_voltage, remark, is_del, create_user, create_time, update_time
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index 0a411d2..2730c9c 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -35,41 +35,37 @@
         id, interchange_code, order_id, certification_company, certification_company_fex, certification_company_email, reciever, reciever_phone, certification_company_address, customer_id, require_over_time, deliver_time, mesure_category, secrecy, appearance, rely_file, deliverer_sign_file, deliverer_sign_time, reciever_sign_file, remark, is_del, create_user, create_time, update_time
     </sql>
 
-    <select id="selectInterchangeList" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
-        SELECT  *
+    <select id="selectInterchangeListPage" resultType="com.casic.missiles.dto.business.interchange.InterchangeListResponse">
+        SELECT   deliverer,customerNo,customerName,orderId,id,interchangeCode,remark,deliverTime
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",customer_code AS "customerCode",customer_name AS "customerName",
-        deliverer,deliver_time AS "deliverTime",remark
-        FROM business_interchange bi
+        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS "deliverTime"
+        FROM business_interchange
         WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.customerCode != null and request.customerCode !=''">
-            AND customer_Code=#{request.customerCode}
-        </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            AND customer_name=#{request.customerName}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND deliverer=#{request.reciever}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
-        <if test="request.deliverTime != null and request.deliverTime !=''">
-            AND deliver_time=#{request.deliverTime}
-        </if>
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.deliverTime != null and request.deliverTime !=''">
+                AND deliver_time=#{request.deliverTime}
+            </if>
         ) bif
         JOIN (
-        SELECT deliverer
-        FROM business_order
-        WHERE is_del = 0
-        <if test="request.deliverer != null and request.deliverer !=''">
-            AND deliverer=#{request.deliverer}
-        </if>
-        ) bo ON bo.id = bif.customer_id
-        ORDER bif.deliver_time DESC
+            SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as  "orderId"
+            FROM business_order
+            WHERE is_del = 0
+            <if test="request.deliverer != null and request.deliverer !=''">
+                AND deliverer=#{request.deliverer}
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND customer_no=#{request.customerNo}
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND customer_name=#{request.customerName}
+            </if>
+        ) bo ON bo.orderId = bif.order_id
+        ORDER BY bo.deliverTime DESC
     </select>
 
     <select id="selectMaxExchangeNo" resultType="Long">
@@ -77,6 +73,4 @@
         FROM business_interchange
     </select>
 
-
-
 </mapper>
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index c385826..d2c0633 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.model.business.BusinessOrderSampleRelation">
-        <id column="id" property="id" />
-        <result column="order_id" property="orderId" />
-        <result column="sample_id" property="sampleId" />
-        <result column="sample_status" property="sampleStatus" />
+        <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="sample_id" property="sampleId"/>
+        <result column="sample_status" property="sampleStatus"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -29,8 +29,71 @@
         csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind
     </sql>
 
+    <select id="getSampleListByStatus" resultType="com.casic.missiles.dto.business.dispatch.DeviceDispatchVO">
+        SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong,
+        bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime"
+        FROM
+        (
+            SELECT *
+            FROM business_order bo
+            WHERE bo.is_del = 0
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND bo.require_over_time &lt; NOW()
+            </if>
+            <if test="request.orderNo != null and request.orderNo !=''">
+                AND bo.order_code LIKE concat('%',#{request.orderNo},'%')
+            </if>
+            <if test="request.customerNo != null and request.customerNo !=''">
+                AND bo.customer_no LIKE concat('%',#{request.customerNo},'%')
+            </if>
+            <if test="request.customerName != null and request.customerName !=''">
+                AND bo.customer_name LIKE concat('%',#{request.customerName},'%')
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND bo.require_over_time &lt;= #{request.startTime}
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND bo.require_over_time &gt; #{request.endTime}
+            </if>
+            <if test="request.isUrgent != null and request.isUrgent !=''">
+                AND bo.is_urgent = #{request.isUrgent}
+            </if>
+        ) bo
+        JOIN
+        (
+            SELECT *
+            FROM business_order_sample_relation bosr
+            WHERE 1=1
+            <if test="request.sampleStatus == 2"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                (bosr.sample_status = 2 OR bosr.sample_status = 3)
+            </if>
+            <if test="request.sampleStatus != 8"><!--非超期状态的其它状态-->
+                AND bosr.sample_status = #{request.sampleStatus}
+            </if>
+        ) bosr ON bo.id = bosr.order_id
+        JOIN (
+            SELECT *
+            FROM customer_sample_info
+            WHERE is_del=0
+            <if test="request.sampleNo != null and request.sampleNo !=''">
+                AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%')
+            </if>
+            <if test="request.sampleName != null and request.sampleName !=''">
+                AND csi.sample_name LIKE concat('%',#{request.sampleName},'%')
+            </if>
+            <if test="request.sampleBelong != null and request.sampleBelong !=''">
+                AND csi.sample_belong = #{request.sampleBelong}
+            </if>
+        ) csi ON csi.id = bosr.sample_id
+    </select>
+
     <select id="selectSampleListByStatus" resultType="com.casic.missiles.dto.business.SampleHandOutListResponse">
-        SELECT <include refid="Status_Column_List"/>
+        SELECT
+        <include refid="Status_Column_List"/>
         FROM business_order bo
         JOIN business_order_sample_relation bosr ON bo.id = bosr.order_id
         JOIN customer_sample_info csi ON csi.id = bosr.sample_id
@@ -72,7 +135,8 @@
     </select>
 
     <select id="selectSampleDetail" resultType="com.casic.missiles.dto.business.SampleHandOutDetailResponse">
-        SELECT <include refid="Detail_Column_List"/>
+        SELECT
+        <include refid="Detail_Column_List"/>
         FROM business_order_sample_relation bosr
         JOIN customer_sample_info csi ON bosr.sample_id = csi.id
         JOIN business_order bo ON bosr.order_id = bo.id
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 596a091..d8ee7af 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -86,6 +86,8 @@
      */
     //规模类型
     String COMPANY_SCALE = "companySize";
+    //
+    String GRADE="grade";
     //规模类型
     String BUSINESS_SCALE = "businessSize";
     //整体评价
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
index 135b82c..b73df1c 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java
@@ -27,4 +27,11 @@
     @ApiModelProperty(value = "样品状态", dataType = "String")
     private String sampleStatus;
 
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
index e53d8c4..917610e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java
@@ -25,51 +25,53 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
+    private Long  orderId;
+    private Long  sampleId;
+    private String  sampleStatus;
     @ApiModelProperty(value = "样品编号", dataType = "String")
-    @ExcelProperty(value = "样品编号",order = 0)
+    @ExcelProperty(value = "样品编号", order = 0)
     private String sampleNo;
 
     @ApiModelProperty(value = "样品名称", dataType = "String")
-    @ExcelProperty(value = "样品名称",order = 1)
+    @ExcelProperty(value = "样品名称", order = 1)
     private String sampleName;
 
     @ApiModelProperty(value = "型号", dataType = "String")
-    @ExcelProperty(value = "型号",order = 2)
+    @ExcelProperty(value = "型号", order = 2)
     private String sampleModel;
 
     @ApiModelProperty(value = "出厂编号", dataType = "String")
-    @ExcelProperty(value = "出厂编号",order = 3)
+    @ExcelProperty(value = "出厂编号", order = 3)
     private String manufacturingNo;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    @ExcelProperty(value = "委托方代码",order = 4)
+    @ExcelProperty(value = "委托方代码", order = 4)
     private String customerNo;
 
     @ApiModelProperty(value = "委托书编号", dataType = "String")
-    @ExcelProperty(value = "委托书编号",order = 5)
+    @ExcelProperty(value = "委托书编号", order = 5)
     private String orderCode;
 
     @ApiModelProperty(value = "委托书名称", dataType = "String")
-    @ExcelProperty(value = "委托书名称",order = 6)
+    @ExcelProperty(value = "委托书名称", order = 6)
     private String customerName;
 
     @ApiModelProperty(value = "计划送达时间", dataType = "String")
-    @ExcelProperty(value = "计划送达时间",order = 7)
+    @ExcelProperty(value = "计划送达时间", order = 7)
     private String planDeliverTime;
 
     //数据库暂时没有字段
     @ApiModelProperty(value = "实际送达时间", dataType = "String")
-    @ExcelProperty(value = "实际送达时间",order = 8)
+    @ExcelProperty(value = "实际送达时间", order = 8)
     private String realDeliverTime;
 
     @ApiModelProperty(value = "样品所属", dataType = "String")
-    @ExcelProperty(value = "样品所属",order = 8)
+    @ExcelProperty(value = "样品所属", order = 8)
     private String sampleBelong;
 
     @ApiModelProperty(value = "当前检定环节", dataType = "String")
-    @ExcelProperty(value = "当前检定环节",order = 9)
-    private String measureNode;
+    @ExcelProperty(value = "当前检定环节", order = 9)
+    private String currentSegment;
 
     @ApiModelProperty(value = "已出具证书", dataType = "Integer")
     @ExcelProperty(value = "已出具证书", order = 12)
@@ -78,7 +80,10 @@
     @ApiModelProperty(value = "应出具证书", dataType = "Integer")
     @ExcelProperty(value = "应出具证书", order = 13)
     private Integer requireCertifications;
+
     //  终止、回退、收入、归还、催办按钮
+    @ApiModelProperty(value = "回退状态（已收入的状态）", dataType = "Integer")
+    private Integer FallbackState;
 
 
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
new file mode 100644
index 0000000..6b7ddc9
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.business.environment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class EnvironmentListRequest {
+
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "开始时间", dataType = "String")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间", dataType = "String")
+    private String endTime;
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
new file mode 100644
index 0000000..d858b3a
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/environment/EnvironmentListResponse.java
@@ -0,0 +1,69 @@
+package com.casic.missiles.dto.business.environment;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel
+@Data
+@TableName("business_environment_record")
+@ColumnWidth(30)
+@HeadRowHeight(15)
+@ContentRowHeight(20)
+@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
+@ExcelIgnoreUnannotated
+public class EnvironmentListResponse {
+
+    @ApiModelProperty(value = "环境记录单id", dataType = "Long")
+    private Long id;
+    @ApiModelProperty(value = "记录单编号", dataType = "String")
+    @ExcelProperty(value = "记录单编号",order = 0)
+    private String environmentCode;
+
+    @ApiModelProperty(value = "房间号", dataType = "String")
+    @ExcelProperty(value = "房间号",order = 1)
+    private String roomNumber;
+
+    @ApiModelProperty(value = "温度", dataType = "String")
+    @ExcelProperty(value = "温度",order = 2)
+    private String temperature;
+
+    @ApiModelProperty(value = "湿度", dataType = "String")
+    @ExcelProperty(value = "湿度",order = 3)
+    private String humidity;
+
+    @ApiModelProperty(value = "输出电压", dataType = "String")
+    @ExcelProperty(value = "输出电压",order = 4)
+    private String outputVoltage;
+
+    @ApiModelProperty(value = "零地电压", dataType = "String")
+    @ExcelProperty(value = "零地电压",order = 5)
+    private String zeroGroundVoltage;
+
+    @ApiModelProperty(value = "备注", dataType = "String")
+    private String remark;
+
+    @ApiModelProperty(value = "记录人", dataType = "String")
+    @ExcelProperty(value = "记录人",order = 6)
+    private String recorder;
+
+    @ApiModelProperty(value = "创建人", dataType = "String")
+    private String createUser;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    private String createTime;
+
+    @ApiModelProperty(value = "记录时间", dataType = "String")
+    @ExcelProperty(value = "记录时间",order = 7)
+    private String recordTime;
+
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
index 37cb067..fd355a3 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class InterchangeListRequest {
@@ -13,7 +15,7 @@
     private String interchangeCode;
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
@@ -24,6 +26,12 @@
     @ApiModelProperty(value = "送检人", dataType = "String")
     private String deliverer; //委托书中自带
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "交接时间", dataType = "String")
     private String deliverTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
index 5ecdc6f..dced92e 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java
@@ -30,7 +30,7 @@
 
     @ApiModelProperty(value = "委托方代码", dataType = "String")
     @ExcelProperty(value = "委托方代码",order = 1)
-    private String customerCode;
+    private String customerNo;
 
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     @ExcelProperty(value = "委托方名称",order = 2)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index ba919d3..7ae7005 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -62,7 +62,7 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "接收状态名称", dataType = "String")
     @ExcelProperty(value = "接收状态名称",order = 7)
-    private Integer statusName;
+    private String statusName;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
     @ExcelProperty(value = "创建时间",order = 8)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
index 11acc4f..9cf2e13 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class OrderListRequest {
@@ -29,6 +31,12 @@
     @ApiModelProperty(value = "委托书开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "委托书结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
index b93049e..a0b9a92 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Advice/CustomerAdviceListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class CustomerAdviceListRequest {
@@ -20,6 +22,13 @@
     @ApiModelProperty(value = "投诉查询开始时间", dataType = "String")
     private String startTime;
 
+
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "投诉查询结束时间", dataType = "String")
     private String endTime;
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
index a6930fd..f3fa4ff 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerInfoResponse.java
@@ -90,9 +90,15 @@
         @ExcelProperty(value = "网址",order =14)
         private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
+        @ApiModelProperty(value = "履约评级id", dataType = "String")
+        @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
         private String grade;
 
+        @TableField(exist = false)
+        @ApiModelProperty(value = "履约评级", dataType = "String")
+        @ExcelProperty(value = "履约评级",order =15)
+        private String gradeName;
+
         @ApiModelProperty(value = "公司规模", dataType = "String")
         @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
         private String companySize;
@@ -117,20 +123,32 @@
         @ApiModelProperty(value = "整体评价", dataType = "String")
         private String evaluationName;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
+        @ApiModelProperty(value = "公司省地址", dataType = "String")
+        @ExcelProperty(value = "公司省地址",order =16)
+        private String addressProvinceName;
+
+        @ApiModelProperty(value = "公司市地址", dataType = "String")
+        @ExcelProperty(value = "公司市地址",order =17)
+        private String addressCityName;
+
+        @ApiModelProperty(value = "公司市详细地址", dataType = "String")
+        @ExcelProperty(value = "公司市详细地址",order =18)
         private String fullAddress;
 
         @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
+        @ExcelProperty(value = "业务范围",order =19)
         private String businessScope;
 
         @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
+        @ExcelProperty(value = "创建时间",order =20)
         private String createTime;
 
         @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
+        @ExcelProperty(value = "最后更新时间",order =21)
         private String updateTime;
 
+        @ApiModelProperty(value = "备注", dataType = "String")
+        @ExcelProperty(value = "备注",order =22)
+        private String remark;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
index b7897cf..95b7ebe 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/Info/CustomerListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author cz
  * @date 2023-02-01
@@ -21,6 +23,12 @@
     @ApiModelProperty(value = "业务规模", dataType = "String")
     private String bussinessSize;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "公司评级", dataType = "String")
     private String grade;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
index 6c7e8b3..67433bf 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListRequest.java
@@ -4,6 +4,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @ApiModel
 public class CustomerSampleListRequest {
@@ -32,6 +34,12 @@
     @ApiModelProperty(value = "检定开始时间", dataType = "String")
     private String startTime;
 
+    /**
+     * 导出ids
+     */
+    @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List")
+    private List<Long> ids;
+
     @ApiModelProperty(value = "检定结束时间", dataType = "String")
     private String endTime;
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
index a7ededa..d23b197 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java
@@ -27,6 +27,7 @@
 
     private Long id;
 
+    @TableField(exist = false)
     private Long orderId;
 
     @ApiModelProperty(value = "样品编号", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
index 12f60ea..8eddeb7 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessEnvironmentRecord.java
@@ -17,7 +17,7 @@
  * @since 2023-02-02
  */
 @Data
-@TableName("business_enviroment_record")
+@TableName("business_environment_record")
 public class BusinessEnvironmentRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -46,7 +46,7 @@
     @TableField("temperature")
     private String temperature;
 
-    @ApiModelProperty(value = "环境记录湿度单编号", dataType = "String")
+    @ApiModelProperty(value = "湿度", dataType = "String")
     @TableField("humidity")
     private String humidity;
 
@@ -74,5 +74,4 @@
     @TableField("update_time")
     private String updateTime;
 
-
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
index 455340b..d5bcdbc 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java
@@ -24,6 +24,8 @@
     @TableId("id")
     private Long id;
 
+
+
     /**
      * 委托书id
      */
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
index 947f87a..3a68b15 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerAdviceInfo.java
@@ -28,6 +28,7 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
     @ExcelProperty(value = "反馈编号",order = 0)
     private String adviceNo;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
index dfcc97b..e1b7bce 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java
@@ -24,6 +24,9 @@
     @ApiModelProperty(value = "委托方id", dataType = "Long")
     private Long customerId;
 
+    @ApiModelProperty(value = "委托方代码", dataType = "String")
+    private String customerNo;
+
     @ApiModelProperty(value = "委托方名称", dataType = "String")
     private String customerName;
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
index 8d77f67..b7ff5dd 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessEnvironmentRecordServiceImpl.java
@@ -3,26 +3,32 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.enums.PrefixCodeEnum;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessEnviromentRecordMapper;
+import com.casic.missiles.mapper.business.BusinessEnvironmentRecordMapper;
+import com.casic.missiles.mapper.business.EnvironmentListResponseMapper;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
-import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.business.IBusinessEnvironmentRecordService;
+import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -34,12 +40,26 @@
  * @since 2023-02-02
  */
 @Service
-public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnviromentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
+public class BusinessEnvironmentRecordServiceImpl extends ServiceImpl<BusinessEnvironmentRecordMapper, BusinessEnvironmentRecord> implements IBusinessEnvironmentRecordService {
 
 
+    @Resource
+    private EnvironmentListResponseMapper environmentListResponseMapper;
+    @Resource
+    private IBaseExportService iBaseExportService;
+
     @Override
-    public Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception {
-        return null;
+    public Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception {
+
+        // 获取列表
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        Page<EnvironmentListResponse> environmentListResponsePage = this.environmentListResponseMapper.selectPage(page, wrapper);
+        if (!CollectionUtils.isEmpty(environmentListResponsePage.getRecords())) {
+            for (EnvironmentListResponse record : environmentListResponsePage.getRecords()) {
+                DictCodeUtils.convertDictCodeToName(record);
+            }
+        }
+        return environmentListResponsePage;
     }
 
     @Override
@@ -70,15 +90,39 @@
     }
 
     @Override
-    public void environmentExport(OrderListRequest request, HttpServletResponse response) {
+    public void environmentExport(EnvironmentListRequest request, HttpServletResponse response) {
 
+        QueryWrapper<EnvironmentListResponse> wrapper = listParamWrapper(request);
+        List<EnvironmentListResponse> environmentListResponseList = this.environmentListResponseMapper.selectList(wrapper);
+        try {
+            iBaseExportService.exportExcel(response, EnvironmentListResponse.class, environmentListResponseList, ExportEnum.ENVIRONMENT_DATA.getSheetName());
+        } catch (IOException e) {
+            log.error("环境记录单导出出现异常，异常信息为{}", e);
+        }
     }
 
     private void initBusinessEnvironmentRecord(BusinessEnvironmentRecord businessEnvironmentRecord) {
         Long maxNo = this.baseMapper.selectMaxCode();
-        String environmentNo = NumberGeneratorUtil.getContactNo("hjjld", maxNo);
+        String environmentNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.ENVIRONMENT_PREFIX, maxNo);
         AuthUser authUser = ShiroKit.getUser();
         businessEnvironmentRecord.setCreateUser(authUser.getId());
+        businessEnvironmentRecord.setRecorder(StringUtils.
+                isNotBlank(businessEnvironmentRecord.getRecorder()) ?
+                businessEnvironmentRecord.getRecorder() : authUser.getName());
         businessEnvironmentRecord.setEnvironmentCode(environmentNo);
     }
+
+
+    private QueryWrapper<EnvironmentListResponse> listParamWrapper(EnvironmentListRequest request) {
+        QueryWrapper<EnvironmentListResponse> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(request.getEnvironmentCode()), "environment_code", request.getEnvironmentCode());
+        wrapper.like(StringUtils.isNotBlank(request.getRoomNumber()), "room_number", request.getRoomNumber());
+        wrapper.apply(StringUtils.isNotBlank(request.getStartTime()),//apply方法传入参数名不能为空
+                "{0} <= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getStartTime());
+        wrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
+                "{0} >= DATE_FORMAT(record_time,'%Y-%m-%d %H:%i:%s')", request.getEndTime());
+        return wrapper;
+    }
+
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
index ea245a5..ef32d16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java
@@ -15,6 +15,7 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper;
 import com.casic.missiles.mapper.business.BusinessInterchangeMapper;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.model.business.BusinessInterchange;
@@ -25,6 +26,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -45,6 +47,7 @@
     private final IBaseExportService iBaseExportService;
     private final CustomerSampleService customerSampleService;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
+    private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper;
 
     //** 送检人查询条件不在设备交接单中，需要联查才可以实现
     @Override
@@ -107,11 +110,16 @@
     @Override
     public void exportExchange(InterchangeListRequest request, HttpServletResponse response) {
         try {
-            Page<InterchangeListResponse> page = PageFactory.defaultPage();
-            page.setCurrent(1);
-            page.setSearchCount(false);
-            page.setSize(Integer.MAX_VALUE);
-            List<InterchangeListResponse> resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            List<InterchangeListResponse> resultPage;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                resultPage =businessInterchangeListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                Page<InterchangeListResponse> page = PageFactory.defaultPage();
+                page.setCurrent(1);
+                page.setSearchCount(false);
+                page.setSize(Integer.MAX_VALUE);
+                resultPage = this.baseMapper.selectInterchangeListPage(page, request);
+            }
             iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName());
         } catch (Exception e) {
             log.error("样品导出出现异常，异常信息为{}", e);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index 9848a3b..4c9d57a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -11,6 +11,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
+import com.casic.missiles.dto.customer.Info.CustomerInfoResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -28,6 +29,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
@@ -109,7 +111,7 @@
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200");
             }
-            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "0") > 0;
+            sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (updateFlag > 0) {
             return ReturnUtil.success();
@@ -126,13 +128,13 @@
         Integer addFlag = this.baseMapper.insert(businessOrder);
         Boolean sampleAddFlag = true;
         this.sampleStatusDeletor(businessOrder.getId());
-        this.doSampleListPopution(businessOrder);
+        this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
-            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId(), "1") > 0;
+            sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
         if (addFlag > 0 && sampleAddFlag) {
             return ReturnUtil.success();
@@ -144,8 +146,13 @@
     @Override
     public void orderExport(OrderListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
-            List<OrderListReponse> orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            List<OrderListReponse> orderListReponseList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                orderListReponseList = orderListReponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<OrderListReponse> wrapper = listParamWrapper(request);
+                orderListReponseList = this.orderListReponseMapper.selectList(wrapper);
+            }
             List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(null);
             Map<Long, List<BusinessOrderSampleRelation>> orderSampleMap = orderSampleList.stream().collect(
                     Collectors.groupingBy(BusinessOrderSampleRelation::getOrderId)
@@ -193,11 +200,13 @@
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getIsUrgent()) && request.getIsUrgent() != 0, "is_urgent", request.getIsUrgent());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(ObjectUtil.isNotEmpty(request.getStatus()) && request.getStatus() != 0, "status", request.getStatus());
+        queryWrapper.eq("is_del",0);
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
                 "{0} >= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getStartTime());
         queryWrapper.apply(StringUtils.isNotBlank(request.getEndTime()),
                 "{0} <= DATE_FORMAT(check_date,'%Y-%m-%d')", request.getEndTime());
         queryWrapper.orderByDesc("create_time");
+
         return queryWrapper;
     }
 
@@ -208,17 +217,16 @@
         return sampleStatus;
     }
 
-    private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) {
+    private Integer sampleStatusCreator(Long orderId, Long sampleId) {
         BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation();
         sampleStatusPopulation.setOrderId(orderId);
         sampleStatusPopulation.setSampleId(sampleId);
-        sampleStatusPopulation.setSampleStatus(status);
         sampleStatusPopulation.setMeasureType("1");
         Integer sampleStatus = this.sampleRelationMapper.insert(sampleStatusPopulation);
         return sampleStatus;
     }
 
-    private void doSampleListPopution(BusinessOrder businessOrder) {
+    private void doSampleListPopulation(BusinessOrder businessOrder) {
         businessOrder.getCustomerSampleInfoList().forEach(
                 customerSampleInfo -> {
                     customerSampleInfo.setOrderId(businessOrder.getId());
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index 66a414b..50d1c6d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,19 +1,18 @@
 package com.casic.missiles.service.Impl.business;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.dto.business.HandOutLabExecutiveDTO;
 import com.casic.missiles.dto.business.SampleHandOutListResponse;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
-import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.*;
 import com.casic.missiles.exception.BusinessException;
-import com.casic.missiles.mapper.business.BusinessOrderMapper;
-import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
-import com.casic.missiles.model.business.BusinessLabExecutiveInfo;
-import com.casic.missiles.model.business.BusinessOrder;
-import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.mapper.business.*;
+import com.casic.missiles.model.business.*;
 import com.casic.missiles.service.business.IBusinessDispatchService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -23,24 +22,80 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
 @AllArgsConstructor
 public class IBusinessDispatchServiceImpl extends ServiceImpl<BusinessOrderSampleRelationMapper, BusinessOrderSampleRelation> implements IBusinessDispatchService {
 
+    private final BusinessOrderSampleRelationMapper orderSampleRelationMapper;
+    private final BusinessLabExecutiveOperateLogMapper labExecutiveOperateLogMapper;
+    private final BusinessCertificateReportMapper certificateReportMapper;
+    private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper;
 
     //终止、回退、收入、归还、催办按钮
     @Override
     public Page<DeviceDispatchVO> listPage(Page<DeviceDispatchVO> page, DeviceDispatchDTO request) {
-//        Page<DeviceDispatchVO>  deviceDispatchVOPage=P
 //        //查询委托书和样品关联表中的各状态的样品
-//        Page<SampleHandOutListResponse> handOutList = orderSampleRelationMapper.selectSampleListByStatus(page, handOutListRequest);
-//        log.info("任务分发-当前查询样品状态为：{}", request.getSampleStatus());
-//        List<SampleHandOutListResponse> records = handOutList.getRecords();
-//        if(CollectionUtils.isEmpty(records)){
-//            return new Page<>();
-//        }
+        Page<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
+        log.info("设备收发-当前查询样品状态为：{}", request.getSampleStatus());
+        List<DeviceDispatchVO> records = dispatchVOPage.getRecords();
+        if (CollectionUtils.isEmpty(records)) {
+            return new Page<>();
+        }
+//        dispatchVOPage.getRecords().stream().forEach(
+//                dispatchVO -> {
+//                    Long orderId = dispatchVO.getOrderId();
+//                    Long sampleId = dispatchVO.getSampleId();
+//                    String sampleStatus = dispatchVO.getSampleStatus();
+//                    switch (sampleStatus) {
+//                        //待分发状态，分发性质:有退回就是退回分发，当前检定环节:待分配，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.TO_HANDOUT:
+//                            List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) {break;};
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            if (CollectionUtils.isEmpty(sendBackOperateLogs)) {
+//                                dispatchVO.setFallbackState(0);
+//                                Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                                dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+//                            } else {
+//                                dispatchVO.setFallbackState(1);
+//                                dispatchVO.setAlreadyCertifications(0);
+//                            }
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                            break;
+//                        //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+//                        case SampleStatusEnum.IN_MEASURE:
+//                            HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            if (Objects.isNull(handOutLabExecutiveDTO)) break;
+//                            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+//                            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+//                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(handOut, measureDeptId));
+//                            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+//                        case SampleStatusEnum.MEASURE_COMPLETE:
+//                            dispatchVO.setCurrentSegment(CurrentSegmentEnum.COMPLETE);
+//                            break;
+//                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+//                        case SampleStatusEnum.BE_OVERDUE:
+//                            //待分发的超期
+//                            if (SampleStatusEnum.TO_HANDOUT.equals(handOut.getSampleStatus())) {
+//                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+//                                break;
+//                            }
+//                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+//                            handOut.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+//                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+//                            handOut.setAlreadyCertifications(getAlreadyCertificateNum(handOut, deptId));
+//                            handOut.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+//                            break;
+//                    }
+//                }
+//        );
         return page;
     }
 
@@ -84,4 +139,38 @@
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", deviceDispatchVO.getOrderId());
+        wrapper.eq("sampleId", deviceDispatchVO.getSampleId());
+        wrapper.eq("measureStatus", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measureStatus", MeasureStatusEnum.TO_MEASURE);
+        return wrapper;
+    }
+
+    private Integer getAlreadyCertificateNum(DeviceDispatchVO  dispatchVO, Long measureDeptId) {
+        Long aLong = certificateReportMapper.selectCount(getCertificateReportWrapper(dispatchVO, measureDeptId));
+        return aLong.intValue();
+    }
+
+    private HandOutLabExecutiveDTO getHandOutLabExecutiveDTO(Long orderId, Long sampleId) {
+        List<HandOutLabExecutiveDTO> labExecutiveList = labExecutiveInfoMapper.selectListByInMeasureStatus(orderId, sampleId);
+        if (CollectionUtils.isEmpty(labExecutiveList)) {
+            log.info("任务分发-检测中状态不存在当前进行检测的实验室，orderId：{}，sampleId：{}", orderId, sampleId);
+            return null;
+        }
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = labExecutiveList.get(0);
+        return handOutLabExecutiveDTO;
+    }
+
+    private QueryWrapper<BusinessCertificateReport> getCertificateReportWrapper(DeviceDispatchVO dispatchVO, Long deptId) {
+        QueryWrapper<BusinessCertificateReport> wrapper = new QueryWrapper<>();
+        wrapper.eq("orderId", dispatchVO.getOrderId());
+        wrapper.eq("sampleId", dispatchVO.getSampleId());
+        wrapper.eq("measure_dept_id", deptId);
+        return wrapper;
+    }
+
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
index ee04e7b..938d725 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerAdviceServiceImpl.java
@@ -8,6 +8,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.advice.CustomerAdviceListRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
@@ -20,6 +21,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -79,8 +81,13 @@
     @Override
     public void adviceExport(CustomerAdviceListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
-            List<CustomerAdviceInfo> customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            List<CustomerAdviceInfo> customerAdviceList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerAdviceList = customerAdviceMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(request);
+                customerAdviceList = customerAdviceMapper.selectList(wrapper);
+            }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
index dec41f1..c4f6cb8 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -53,11 +54,13 @@
         QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
         Page<CustomerSampleListResponse> customerSamplePage = customerSampleListResponseMapper.selectPage(page, wrapper);
         customerSamplePage.getRecords().stream()
-                .forEach(customerSample ->{
-                    BusinessOrderSampleRelation businessOrderSampleRelation=this.getSampleStatusById(customerSample.getId());
-                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
-                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
-                 });
+                .forEach(customerSample -> {
+                    BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                        customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                        customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                    }
+                });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
             if (!StringUtils.isEmpty(customerSampleListResponse.getSampleSatus())) {
                 DictCodeUtils.convertDictCodeToName(customerSampleListResponse);
@@ -99,23 +102,33 @@
     }
 
     /**
-     *  只导出样品列表信息
+     * 只导出样品列表信息
+     *
      * @param request
      * @param response
      */
     @Override
     public void sampleExport(CustomerSampleListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
-            List<CustomerSampleListResponse> customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
-            Map<String, String> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> String.valueOf(e.getOrderId() + e.getSampleId()), BusinessOrderSampleRelation::getSampleStatus));
+            Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
+                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
+                            ( value1,value2) ->value1));
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerSampleListResponse> wrapper = listParamWrapper(request);
+                customerSampleList = customerSampleListResponseMapper.selectList(wrapper);
+            }
             customerSampleList.stream().filter(customerSample -> !ObjectUtils.isEmpty(customerSample.getOrderId()))
                     .forEach(
                             customerSample -> {
-                                String orderSampleIdKey = String.valueOf(customerSample.getOrderId() + customerSample.getId());
-                                customerSample.setSampleSatus(businessOrderMap.containsKey(orderSampleIdKey) ? businessOrderMap.get(orderSampleIdKey) : "");
+                                BusinessOrderSampleRelation businessOrderSampleRelation = businessOrderMap.get(customerSample.getId());
+                                if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
+                                    customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
+                                    customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus());
+                                }
                             }
                     );
             for (CustomerSampleListResponse customerSampleListResponse : customerSampleList) {
@@ -161,7 +174,7 @@
                 .orderByDesc("create_time");
         List<BusinessOrderSampleRelation> orderSampleList = sampleRelationMapper.selectList(wrapper);
         Optional<BusinessOrderSampleRelation> orderSampleOptional = orderSampleList.stream().findFirst();
-        return orderSampleOptional.isPresent() ? orderSampleOptional.get(): null;
+        return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
     private void initSample(CustomerSampleInfo customerSampleInfo) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index 6b05b67..85918e9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -56,6 +57,16 @@
     }
 
     @Override
+    public List<CustomerInfoResponse> customerList( CustomerListRequest request) throws Exception {
+        QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
+        List<CustomerInfoResponse> resultList = customerInfoResponseMapper.selectList(wrapper);
+        for (CustomerInfoResponse customerInfo : resultList) {
+            DictCodeUtils.convertDictCodeToName(customerInfo);
+        }
+        return resultList;
+    }
+
+    @Override
     @Transactional
     public ReturnDTO addCustomer(CustomerInfo customerInfo) {
         initCustomerInfo(customerInfo);
@@ -72,8 +83,9 @@
     public ReturnDTO updateCustomer(CustomerInfo customerInfo) {
         AuthUser authUser = ShiroKit.getUser();
         customerInfo.setUpdateUser(authUser.getId());
+        userInfoListDeletor(customerInfo.getId());
         Integer updateFlag = this.baseMapper.updateById(customerInfo);
-        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList());
+        Boolean userUpdateFlag = userInfoListEditor(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -89,7 +101,9 @@
 
     @Override
     public ReturnDTO deleteCustomer(Long id) {
+        CustomerInfo customerInfo = this.baseMapper.selectById(id);
         Integer deleteFlag = this.baseMapper.deleteById(id);
+        userInfoListDeletor(customerInfo.getId());
         if (deleteFlag > 0) {
             return ReturnUtil.success();
         }
@@ -110,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -133,8 +146,13 @@
     @Override
     public void customerExport(CustomerListRequest request, HttpServletResponse response) {
         try {
-            QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-            List<CustomerInfoResponse> customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+            List<CustomerInfoResponse> customerInfoList;
+            if (!CollectionUtils.isEmpty(request.getIds())) {
+                customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
+            } else {
+                QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
+            }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
             }
@@ -150,7 +168,8 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getBussinessSize()), "bussiness_size", request.getBussinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
+        queryWrapper.eq("is_del", 0);
         return queryWrapper;
     }
 
@@ -170,10 +189,18 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
+    }
+
+
+    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList,Long id) {
         Boolean userUpdateFlag = true;
         for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
+            customerUserInfo.setCustomerId(id);
+            Integer userUpdateNum = customerUserMapper.insert(customerUserInfo);
             if (userUpdateNum <= 0) {
                 userUpdateFlag = false;
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
index 5bc1307..de26f89 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessEnvironmentRecordService.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.dto.business.environment.EnvironmentListRequest;
+import com.casic.missiles.dto.business.environment.EnvironmentListResponse;
 import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.dto.business.order.OrderListRequest;
 import com.casic.missiles.model.business.BusinessEnvironmentRecord;
@@ -18,7 +20,8 @@
  * @since 2023-02-02
  */
 public interface IBusinessEnvironmentRecordService extends IService<BusinessEnvironmentRecord> {
-    Page<OrderListReponse> orderListPage(Page<OrderListReponse> page, OrderListRequest request) throws Exception;
+
+    Page<EnvironmentListResponse> environmentListPage(Page<EnvironmentListResponse> page, EnvironmentListRequest request) throws Exception;
 
     BusinessEnvironmentRecord environmentDetail(Long id);
 
@@ -28,6 +31,8 @@
 
     ReturnDTO addEnvironment(BusinessEnvironmentRecord businessEnvironmentRecord);
 
-    void environmentExport(OrderListRequest request, HttpServletResponse response);
+    void environmentExport(EnvironmentListRequest request, HttpServletResponse response);
+
 
 }
+
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java
index 31766cf..5d096e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerService.java
@@ -8,11 +8,15 @@
 import com.casic.missiles.model.customer.CustomerInfo;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 public interface CustomerService {
 
     Page<CustomerInfoResponse> listPage(Page<CustomerInfoResponse> page, CustomerListRequest request)  throws  Exception;
 
+    List<CustomerInfoResponse> customerList(CustomerListRequest request)  throws  Exception;
+
+
     ReturnDTO addCustomer(CustomerInfo customerInfo);
 
     ReturnDTO updateCustomer(CustomerInfo customerInfo);