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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long 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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index ebd8ff6..6225d4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -35,6 +35,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -95,6 +96,7 @@
         String status = request.getApprovalStatus();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -102,6 +104,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -146,16 +149,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentStandardApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -165,6 +165,9 @@
         EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
         EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        if(ObjectUtil.isEmpty(standardEquipment)){
+            throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
+        }
         DictCodeUtils.convertDictCodeToName(standardEquipment);
         result.setMeterStandardEquipment(standardEquipment);
         QueryWrapper<EquipmentStandardApplyEquipment> wrapper = new QueryWrapper<>();
@@ -177,7 +180,7 @@
         }
         // 通过对应设备id查询设备详细信息
         QueryWrapper<EquipmentFixedAssets> fixedAssetsWrapper = new QueryWrapper<>();
-        if(CollectionUtils.isEmpty(equipmentIds)){
+        if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){
             fixedAssetsWrapper.in("id", equipmentIds);
             List<EquipmentFixedAssets> meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper);
             result.setFixedAssetsList(meterFixedAssets);
@@ -191,6 +194,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         Long maxNo = meterStandardApplyMapper.selectMaxNo();
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
@@ -217,21 +221,21 @@
             }
             if(fileListResult&&equipmentListResult){
                 return ReturnUtil.success(meterStandardApply.getId());
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
         if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -268,6 +272,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO approvalDelete(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -285,10 +290,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
@@ -303,7 +309,7 @@
             runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index ebd8ff6..6225d4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -35,6 +35,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -95,6 +96,7 @@
         String status = request.getApprovalStatus();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -102,6 +104,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -146,16 +149,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentStandardApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -165,6 +165,9 @@
         EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
         EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        if(ObjectUtil.isEmpty(standardEquipment)){
+            throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
+        }
         DictCodeUtils.convertDictCodeToName(standardEquipment);
         result.setMeterStandardEquipment(standardEquipment);
         QueryWrapper<EquipmentStandardApplyEquipment> wrapper = new QueryWrapper<>();
@@ -177,7 +180,7 @@
         }
         // 通过对应设备id查询设备详细信息
         QueryWrapper<EquipmentFixedAssets> fixedAssetsWrapper = new QueryWrapper<>();
-        if(CollectionUtils.isEmpty(equipmentIds)){
+        if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){
             fixedAssetsWrapper.in("id", equipmentIds);
             List<EquipmentFixedAssets> meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper);
             result.setFixedAssetsList(meterFixedAssets);
@@ -191,6 +194,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         Long maxNo = meterStandardApplyMapper.selectMaxNo();
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
@@ -217,21 +221,21 @@
             }
             if(fileListResult&&equipmentListResult){
                 return ReturnUtil.success(meterStandardApply.getId());
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
         if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -268,6 +272,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO approvalDelete(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -285,10 +290,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
@@ -303,7 +309,7 @@
             runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
index b1b937c..047f173 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
@@ -48,6 +48,7 @@
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -55,6 +56,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -99,16 +101,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<StateManageResponse> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index ebd8ff6..6225d4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -35,6 +35,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -95,6 +96,7 @@
         String status = request.getApprovalStatus();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -102,6 +104,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -146,16 +149,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentStandardApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -165,6 +165,9 @@
         EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
         EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        if(ObjectUtil.isEmpty(standardEquipment)){
+            throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
+        }
         DictCodeUtils.convertDictCodeToName(standardEquipment);
         result.setMeterStandardEquipment(standardEquipment);
         QueryWrapper<EquipmentStandardApplyEquipment> wrapper = new QueryWrapper<>();
@@ -177,7 +180,7 @@
         }
         // 通过对应设备id查询设备详细信息
         QueryWrapper<EquipmentFixedAssets> fixedAssetsWrapper = new QueryWrapper<>();
-        if(CollectionUtils.isEmpty(equipmentIds)){
+        if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){
             fixedAssetsWrapper.in("id", equipmentIds);
             List<EquipmentFixedAssets> meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper);
             result.setFixedAssetsList(meterFixedAssets);
@@ -191,6 +194,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         Long maxNo = meterStandardApplyMapper.selectMaxNo();
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
@@ -217,21 +221,21 @@
             }
             if(fileListResult&&equipmentListResult){
                 return ReturnUtil.success(meterStandardApply.getId());
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
         if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -268,6 +272,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO approvalDelete(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -285,10 +290,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
@@ -303,7 +309,7 @@
             runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
index b1b937c..047f173 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
@@ -48,6 +48,7 @@
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -55,6 +56,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -99,16 +101,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<StateManageResponse> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index d3f8c1e..8493995 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -174,7 +174,7 @@
     }
 
     @Override
-    public ReturnDTO<EquipmentWorkbenchResponse> myselfEquipment() {
+    public ReturnDTO myselfEquipment() {
         EquipmentWorkbenchResponse response = new EquipmentWorkbenchResponse();
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -182,9 +182,14 @@
         });
         // 待检定数量
         List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
-        response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString()));
-        equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString());
-        return null;
+        if(businessKeys.size()==0){
+            response.setVerifiedNum(0);
+            response.setOvertimeNum(0);
+        }else {
+            response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys, String.valueOf(user.getId())));
+            response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys, String.valueOf(user.getId())));
+        }
+        return  ReturnUtil.success(response);
     }
 
     public List<EquipmentWorkbenchResponse> getResultList(List<EquipmentWorkbenchResponse> resList) {

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index ebd8ff6..6225d4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -35,6 +35,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -95,6 +96,7 @@
         String status = request.getApprovalStatus();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -102,6 +104,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -146,16 +149,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentStandardApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -165,6 +165,9 @@
         EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
         EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        if(ObjectUtil.isEmpty(standardEquipment)){
+            throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
+        }
         DictCodeUtils.convertDictCodeToName(standardEquipment);
         result.setMeterStandardEquipment(standardEquipment);
         QueryWrapper<EquipmentStandardApplyEquipment> wrapper = new QueryWrapper<>();
@@ -177,7 +180,7 @@
         }
         // 通过对应设备id查询设备详细信息
         QueryWrapper<EquipmentFixedAssets> fixedAssetsWrapper = new QueryWrapper<>();
-        if(CollectionUtils.isEmpty(equipmentIds)){
+        if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){
             fixedAssetsWrapper.in("id", equipmentIds);
             List<EquipmentFixedAssets> meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper);
             result.setFixedAssetsList(meterFixedAssets);
@@ -191,6 +194,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         Long maxNo = meterStandardApplyMapper.selectMaxNo();
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
@@ -217,21 +221,21 @@
             }
             if(fileListResult&&equipmentListResult){
                 return ReturnUtil.success(meterStandardApply.getId());
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
         if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -268,6 +272,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO approvalDelete(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -285,10 +290,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
@@ -303,7 +309,7 @@
             runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
index b1b937c..047f173 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
@@ -48,6 +48,7 @@
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -55,6 +56,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -99,16 +101,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<StateManageResponse> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index d3f8c1e..8493995 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -174,7 +174,7 @@
     }
 
     @Override
-    public ReturnDTO<EquipmentWorkbenchResponse> myselfEquipment() {
+    public ReturnDTO myselfEquipment() {
         EquipmentWorkbenchResponse response = new EquipmentWorkbenchResponse();
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -182,9 +182,14 @@
         });
         // 待检定数量
         List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
-        response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString()));
-        equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString());
-        return null;
+        if(businessKeys.size()==0){
+            response.setVerifiedNum(0);
+            response.setOvertimeNum(0);
+        }else {
+            response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys, String.valueOf(user.getId())));
+            response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys, String.valueOf(user.getId())));
+        }
+        return  ReturnUtil.success(response);
     }
 
     public List<EquipmentWorkbenchResponse> getResultList(List<EquipmentWorkbenchResponse> resList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
index 17f4fe9..418298f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
@@ -854,6 +854,16 @@
     protected static EndEvent createEndEvent() {
         EndEvent endEvent = new EndEvent();
         endEvent.setId(id("end"));
+        // 事件结束监听器
+        ArrayList<FlowableListener> listeners = new ArrayList<>();
+        FlowableListener listener = new FlowableListener();
+        // 结束节点开始时
+        listener.setEvent((ExecutionListener.EVENTNAME_START));
+        // 监听器类型
+        listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_CLASS);
+        listener.setImplementation("com.casic.missiles.listeners.flowable.ProcessUpdateStateListener");
+        listeners.add(listener);
+        endEvent.setExecutionListeners(listeners);
         return endEvent;
     }
 

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index ebd8ff6..6225d4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -35,6 +35,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -95,6 +96,7 @@
         String status = request.getApprovalStatus();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -102,6 +104,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -146,16 +149,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentStandardApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -165,6 +165,9 @@
         EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
         EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        if(ObjectUtil.isEmpty(standardEquipment)){
+            throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
+        }
         DictCodeUtils.convertDictCodeToName(standardEquipment);
         result.setMeterStandardEquipment(standardEquipment);
         QueryWrapper<EquipmentStandardApplyEquipment> wrapper = new QueryWrapper<>();
@@ -177,7 +180,7 @@
         }
         // 通过对应设备id查询设备详细信息
         QueryWrapper<EquipmentFixedAssets> fixedAssetsWrapper = new QueryWrapper<>();
-        if(CollectionUtils.isEmpty(equipmentIds)){
+        if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){
             fixedAssetsWrapper.in("id", equipmentIds);
             List<EquipmentFixedAssets> meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper);
             result.setFixedAssetsList(meterFixedAssets);
@@ -191,6 +194,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         Long maxNo = meterStandardApplyMapper.selectMaxNo();
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
@@ -217,21 +221,21 @@
             }
             if(fileListResult&&equipmentListResult){
                 return ReturnUtil.success(meterStandardApply.getId());
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
         if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -268,6 +272,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO approvalDelete(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -285,10 +290,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
@@ -303,7 +309,7 @@
             runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
index b1b937c..047f173 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
@@ -48,6 +48,7 @@
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -55,6 +56,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -99,16 +101,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<StateManageResponse> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index d3f8c1e..8493995 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -174,7 +174,7 @@
     }
 
     @Override
-    public ReturnDTO<EquipmentWorkbenchResponse> myselfEquipment() {
+    public ReturnDTO myselfEquipment() {
         EquipmentWorkbenchResponse response = new EquipmentWorkbenchResponse();
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -182,9 +182,14 @@
         });
         // 待检定数量
         List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
-        response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString()));
-        equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString());
-        return null;
+        if(businessKeys.size()==0){
+            response.setVerifiedNum(0);
+            response.setOvertimeNum(0);
+        }else {
+            response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys, String.valueOf(user.getId())));
+            response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys, String.valueOf(user.getId())));
+        }
+        return  ReturnUtil.success(response);
     }
 
     public List<EquipmentWorkbenchResponse> getResultList(List<EquipmentWorkbenchResponse> resList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
index 17f4fe9..418298f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
@@ -854,6 +854,16 @@
     protected static EndEvent createEndEvent() {
         EndEvent endEvent = new EndEvent();
         endEvent.setId(id("end"));
+        // 事件结束监听器
+        ArrayList<FlowableListener> listeners = new ArrayList<>();
+        FlowableListener listener = new FlowableListener();
+        // 结束节点开始时
+        listener.setEvent((ExecutionListener.EVENTNAME_START));
+        // 监听器类型
+        listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_CLASS);
+        listener.setImplementation("com.casic.missiles.listeners.flowable.ProcessUpdateStateListener");
+        listeners.add(listener);
+        endEvent.setExecutionListeners(listeners);
         return endEvent;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
index 6ae3aa2..2fc354d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,11 +14,13 @@
 
     void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response);
 
-    ReturnDTO receiveDevice(Long id);
+    ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO backDevice(Long id);
+    ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO forcedTerminate(Long id);
+    ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO rushDoProcess(Long id);
+    ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO);
+
+    ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO);
 }

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 dc5e97a..b7f70f6 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
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.business.BusinessOrder;
@@ -60,15 +61,27 @@
     }
 
     /**
+     * 无需检测需要检定人在填入错误的情况下，不必进行检测
+     */
+    @ApiOperation("无需检测")
+    @PostMapping("/cancelMeasure")
+    public ReturnDTO<BusinessOrder> cancelMeasure(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(bizDispatchService.cancelMeasure(deviceReceiveDTO));
+    }
+
+    /**
      * 手动收入
      */
     @ApiOperation("设备收入(只有已收入的设备可以进行终止操作)")
     @PostMapping("/receive")
-    public ReturnDTO<BusinessOrder> receiveDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> receiveDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.receiveDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.receiveDevice(deviceReceiveDTO));
     }
 
     /**
@@ -76,11 +89,11 @@
      */
     @ApiOperation("设备回退(只有已收入、待归还、已归可执行回退)")
     @PostMapping("/back")
-    public ReturnDTO<BusinessOrder> backDevice(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> backDevice(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.backDevice(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.backDevice(deviceReceiveDTO));
     }
 
     /**
@@ -88,11 +101,11 @@
      */
     @ApiOperation("设备终止(只有已收入的设备可以进行终止操作)")
     @PostMapping("/terminate")
-    public ReturnDTO<BusinessOrder> forcedTerminate(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> forcedTerminate(@Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.forcedTerminate(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.forcedTerminate(deviceReceiveDTO));
     }
 
     /**
@@ -100,11 +113,11 @@
      */
     @ApiOperation("催办")
     @PostMapping("/rushDoProcess")
-    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+    public ReturnDTO<BusinessOrder> rushDoProcess(@RequestBody @Valid DeviceReceiveDTO deviceReceiveDTO) {
+        Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId())||Objects.isNull(deviceReceiveDTO.getSampleId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(bizDispatchService.rushDoProcess(idDTO.getId()));
+        return ReturnUtil.success(bizDispatchService.rushDoProcess(deviceReceiveDTO));
     }
 
 
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/equipment/EquipmentAcceptanceCheckController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
index baadff0..361e063 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentAcceptanceCheckController.java
@@ -49,7 +49,10 @@
     @ApiOperation("设备检修保养验收单列表")
     @PostMapping("/acceptanceCheckList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody AcceptanceCheckRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<AcceptanceCheck>> acceptanceCheckList(@RequestBody @Valid AcceptanceCheckRequest request, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<AcceptanceCheck> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentAcceptanceCheckService.acceptanceCheckList(page, request)));
     }
@@ -60,7 +63,10 @@
     @ApiOperation("设备检修保养验收单详细信息")
     @PostMapping("/acceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> acceptanceCheckInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentAcceptanceCheckService.acceptanceCheckInfo(idDTO));
     }
 
@@ -70,7 +76,10 @@
     @ApiOperation("设备检修保养验收单新建")
     @PostMapping("/addAcceptanceCheck")
     @ResponseBody
-    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addAcceptanceCheck(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if (bindingResult.hasErrors()) {
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.addAcceptanceCheck(equipmentApply);
     }
 
@@ -94,7 +103,10 @@
     @ApiOperation("设备检修保养验收单审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -104,7 +116,10 @@
     @ApiOperation("设备检修保养验收单编辑")
     @PostMapping("/updateAcceptanceCheckInfo")
     @ResponseBody
-    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateAcceptanceCheckInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentAcceptanceCheckService.updateAcceptanceCheckInfo(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
index 40eb8fd..596daef 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java
@@ -57,7 +57,10 @@
     @ApiOperation("设备借用-领用申请列表查询")
     @PostMapping("/equipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody EquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentApply>> equipmentApplyList(@RequestBody @Valid EquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(equipmentApplyService.equipmentApplyList(page, request)));
     }
@@ -68,7 +71,10 @@
     @ApiOperation("设备借用-领用申请详细信息")
     @PostMapping("/equipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentApply> equipmentApplyInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(equipmentApplyService.equipmentApplyInfo(idDTO));
     }
 
@@ -78,7 +84,10 @@
     @ApiOperation("设备借用-领用申请新建（保存）")
     @PostMapping("/addEquipmentApply")
     @ResponseBody
-    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) throws Exception{
+    public ReturnDTO addEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.addEquipmentApply(equipmentApply);
     }
 
@@ -98,7 +107,10 @@
     @ApiOperation("设备借用-领用申请审批操作-删除")
     @PostMapping("deleteEquipmentApply")
     @ResponseBody
-    public ReturnDTO deleteEquipmentApply(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteEquipmentApply(@RequestBody @Valid  ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -108,7 +120,10 @@
     @ApiOperation("设备借用-领用申请信息编辑")
     @PostMapping("/updateEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateEquipmentApply(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return equipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
@@ -129,6 +144,9 @@
     @PostMapping("/borrowEquipmentApply")
     @ResponseBody
     public ReturnDTO borrowEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.borrowEquipmentApply(idDto);
     }
 
@@ -139,6 +157,9 @@
     @PostMapping("/returnEquipmentApply")
     @ResponseBody
     public ReturnDTO returnEquipmentApply(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return equipmentApplyService.returnEquipmentApply(idDto);
     }
 
@@ -146,7 +167,10 @@
     @ApiOperation("更新设备处理状态（领用/退领）")
     @PostMapping("/updateProcessResult")
     @ResponseBody
-    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request) throws Exception {
+    public ReturnDTO updateProcessResult(@RequestBody @Valid EquipmentApplyProcessRequest request, BindingResult bindingResult) throws Exception {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         DictCodeUtils.validDictCode(request);
         return equipmentApplyService.updateProcessResult(request);
     }
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
index d4708c5..d2229e9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentCheckInfoController.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.controller.equipment;
 
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
@@ -9,16 +10,21 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.equipment.IEquipmentCheckInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Objects;
 
 /**
  ** <p>
@@ -44,7 +50,10 @@
     @ApiOperation("设备管理点检查列表")
     @PostMapping("/checkInfoList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody CheckInfoRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentCheckInfo>> checkInfoList(@RequestBody @Valid CheckInfoRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentCheckInfo> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(iEquipmentCheckInfoService.checkInfoList(page, request)));
     }
@@ -55,7 +64,10 @@
     @ApiOperation("设备管理点检查列表删除")
     @PostMapping("/deleteCheckInfo")
     @ResponseBody
-    public ReturnDTO deleteCheckInfo(@RequestBody IdDTO idDto) {
+    public ReturnDTO deleteCheckInfo(@RequestBody @Valid IdDTO idDto) {
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return iEquipmentCheckInfoService.deleteCheckInfo(idDto);
     }
 
@@ -66,7 +78,10 @@
     @ApiOperation("设备管理点检查详细信息")
     @PostMapping("/selectCheckInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<EquipmentCheckInfo> selectStaffInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(iEquipmentCheckInfoService.selectCheckInfo(idDto));
     }
 
@@ -76,7 +91,10 @@
     @ApiOperation("备管理点检查新建")
     @PostMapping("/addCheckInfo")
     @ResponseBody
-    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo) throws Exception{
+    public ReturnDTO addCheckInfo(@RequestBody @Valid EquipmentCheckInfo equipmentCheckInfo, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return iEquipmentCheckInfoService.addCheckInfo(equipmentCheckInfo);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
index 22bdf5f..aeb15a2 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java
@@ -54,7 +54,10 @@
     @ApiOperation("标准装置申请列表")
     @PostMapping("/standardEquipmentApplyList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody StandardEquipmentApplyRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<EquipmentStandardApply>> standardEquipmentApplyList(@RequestBody @Valid StandardEquipmentApplyRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<EquipmentStandardApply> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(standardEquipmentApplyService.standardEquipmentApplyList(page, request)));
     }
@@ -65,7 +68,10 @@
     @ApiOperation("标准装置申请详细信息")
     @PostMapping("/standardEquipmentApplyInfo")
     @ResponseBody
-    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody IdDTO idDTO) throws Exception{
+    public ReturnDTO<EquipmentStandardEquipment> standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{
+        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(standardEquipmentApplyService.standardEquipmentApplyInfo(idDTO));
     }
 
@@ -75,7 +81,10 @@
     @ApiOperation("标准装置申请新建")
     @PostMapping("/addStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) throws Exception{
+    public ReturnDTO addStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.addStandardEquipmentApply(meterStandardApply);
     }
 
@@ -85,7 +94,10 @@
     @ApiOperation("标准装置申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.submitStandardEquipmentApply(request);
     }
 
@@ -96,7 +108,10 @@
     @ApiOperation("审批操作-删除")
     @PostMapping("/approval/operate/delete")
     @ResponseBody
-    public ReturnDTO delete(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.approvalDelete(request);
     }
 
@@ -107,7 +122,10 @@
     @ApiOperation("标准装置申请信息编辑")
     @PostMapping("/updateStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply) {
+    public ReturnDTO updateStandardEquipmentApply(@RequestBody @Valid EquipmentStandardApply meterStandardApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return standardEquipmentApplyService.updateStandardEquipmentApply(meterStandardApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
index 2f52ad0..be54567 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java
@@ -56,7 +56,10 @@
     @ApiOperation("状态管理申请列表")
     @PostMapping("/stateManageList")
     @ResponseBody
-    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody StateManageRequest request) throws Exception{
+    public ReturnDTO<PageInfoBT<StateManageResponse>> applyList(@RequestBody @Valid StateManageRequest request, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         Page<StateManageResponse> page = PageFactory.defaultPage();
         return ReturnUtil.success(super.packForBT(stateManageService.stateManageList(page, request)));
     }
@@ -67,7 +70,10 @@
     @ApiOperation("状态管理申请列表删除")
     @PostMapping("/deleteStateManageList")
     @ResponseBody
-    public ReturnDTO deleteStateManageList(@RequestBody ApprovalDeleteRequest request) {
+    public ReturnDTO deleteStateManageList(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.deleteEquipmentApply(request);
     }
 
@@ -77,7 +83,10 @@
     @ApiOperation("状态管理申请提交")
     @PostMapping("/submitStandardEquipmentApply")
     @ResponseBody
-    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request) {
+    public ReturnDTO submitStandardEquipmentApply(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.submitEquipmentApply(request);
     }
 
@@ -87,7 +96,10 @@
     @ApiOperation("状态管理申请详细信息")
     @PostMapping("/selectStateManageInfo")
     @ResponseBody
-    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody IdDTO idDto) throws Exception{
+    public ReturnDTO<StateManageResponse> selectStateManageInfo(@RequestBody @Valid IdDTO idDto) throws Exception{
+        Assert.isFalse(Objects.isNull(idDto.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
         return ReturnUtil.success(stateManageService.selectStateManageInfo(idDto));
     }
 
@@ -97,7 +109,10 @@
     @ApiOperation("设状态管理申请新建")
     @PostMapping("/addStateManageInfo")
     @ResponseBody
-    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply) throws Exception{
+    public ReturnDTO addStateManageInfo(@RequestBody @Valid EquipmentApply meterEquipmentApply, BindingResult bindingResult) throws Exception{
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.addEquipmentApply(meterEquipmentApply);
     }
 
@@ -109,7 +124,10 @@
     @ApiOperation("状态管理申请编辑")
     @PostMapping("/updateStateManageInfo")
     @ResponseBody
-    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply) {
+    public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
+        }
         return meterEquipmentApplyService.updateEquipmentApply(equipmentApply);
     }
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
deleted file mode 100644
index fa43312..0000000
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/UpdateState.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.casic.missiles.controller.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.JavaDelegate;
-
-public class UpdateState implements JavaDelegate {
-
-    @Override
-    public void execute(DelegateExecution delegateExecution) {
-        System.err.println("服务节点调用");
-    }
-}
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
index 0ce953e..8022cb4 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/CurrentSegmentEnum.java
@@ -7,5 +7,6 @@
  */
 public interface CurrentSegmentEnum {
     String TO_ALLOCATE = "待分配";
+    String TO_INCOME = "待收入";
     String COMPLETE = "完成";
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
index af602f0..385406c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java
@@ -1,24 +1,26 @@
 package com.casic.missiles.enums;
 
-public enum EquipmentApplyProcessEnum {
+public interface EquipmentApplyProcessEnum {
+    // 待领用
+    String WAIT_COLLECTING = "4";
+    // 已领用
+    String ALREADY_COLLECTING = "5";
+    // 待借用
+    String WAIT_BORROWED = "1";
+    // 已借用
+    String ALREADY_BORROWED = "2";
+    // 已归还
+    String ALREADY_RETURN = "3";
+    // 在用(启封)
+    String USE = "1";
+    // 闲置
+    String IDLE = "2";
+    // 封存
+    String SEALED = "3";
+    // 报废
+    String SCRAP = "4";
+    // 处置
+    String MANAGEMENT = "5";
 
-    WAIT_BORROWED("1", "待借用"),
-    ALREADY_BORROWED("2", "已借用"),
-    ALREADY_RETURN("3", "已归还");
 
-    private final String code;
-    private final String value;
-
-    EquipmentApplyProcessEnum(String code, String value) {
-        this.code = code;
-        this.value = value;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getValue() {
-        return value;
-    }
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
new file mode 100644
index 0000000..e9d25d5
--- /dev/null
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -0,0 +1,101 @@
+package com.casic.missiles.listeners.flowable;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.casic.missiles.dto.ReturnUtil;
+import com.casic.missiles.enums.ApplyFromIdEnum;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.enums.EquipmentApplyProcessEnum;
+import com.casic.missiles.enums.MeasureStatusEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.mapper.MeterFixedAssetsMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper;
+import com.casic.missiles.mapper.equipment.EquipmentApplyMapper;
+import com.casic.missiles.mapper.system.SystemFlowFormMapper;
+import com.casic.missiles.model.equipment.EquipmentApply;
+import com.casic.missiles.model.equipment.EquipmentApplyEquipment;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
+import com.casic.missiles.model.system.SystemFlowForm;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+public class ProcessUpdateStateListener implements ExecutionListener {
+
+    private static final long serialVersionUID = -1748257184303139934L;
+    @Resource
+    private RepositoryService repositoryService;
+
+    @Resource
+    private SystemFlowFormMapper flowFormMapper;
+
+    @Resource
+    private EquipmentApplyEquipmentMapper equipmentMapper;
+
+    @Resource
+    private MeterFixedAssetsMapper meterFixedAssetsMapper;
+
+    @Resource
+    private EquipmentApplyMapper equipmentApplyMapper;
+
+    @Override
+    public void notify(DelegateExecution execution) {
+        System.err.println("审批通过触发监听器:"+execution);
+        ProcessDefinition processDefinition = repositoryService.getProcessDefinition(execution.getProcessDefinitionId());
+        QueryWrapper<SystemFlowForm> wrapper = new QueryWrapper<>();
+        wrapper.eq("pro_def_id", processDefinition.getKey());
+        wrapper.eq("is_del", 0);
+        SystemFlowForm systemFlowForm = flowFormMapper.selectOne(wrapper);
+        String id = execution.getProcessInstanceBusinessKey();
+        switch (systemFlowForm.getFormId()){
+            // 标准装置申请
+           /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;
+            case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/
+            // 设备状态管理申请
+            case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break;
+            case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break;
+            case ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.USE);break;
+            case ApplyFromIdEnum.DEVICE_SCRAPPED_ROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SCRAP);break;
+            case ApplyFromIdEnum.DEVICE_HANDLE_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.MANAGEMENT);break;
+            // 设备借用领用申请
+            case ApplyFromIdEnum.DEVICE_CONSUMING_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_COLLECTING);break;
+            case ApplyFromIdEnum.DEVICE_BORROW_APPROVAL: updateEquipmentApplyState(id, EquipmentApplyProcessEnum.WAIT_BORROWED);break;
+        }
+    }
+
+    private void updateEquipmentApplyState(String id, String state) {
+        UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id).set("process_result", state);
+        if(equipmentApplyMapper.update(null, updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateEquipmentState(String id, String state) {
+        QueryWrapper<EquipmentApplyEquipment> wrapper = new QueryWrapper<>();
+        wrapper.eq("apply_id", id);
+        List<EquipmentApplyEquipment> equipmentApplyEquipments = equipmentMapper.selectList(wrapper);
+        List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
+        UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id",equipmentIds).set("manager_state",state);
+        if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+        }
+    }
+
+    private void updateStandardState(String businessKey,String state) {
+    }
+}
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/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
index 7a0049e..f87e1f8 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java
@@ -13,9 +13,9 @@
 
     List<EquipmentWorkbenchResponse> measureTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    List<EquipmentWorkbenchResponse> standardTrend(String startTime, String endTime);
+    List<EquipmentWorkbenchResponse> standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime);
 
-    int queryVerifiedNum(@Param("ids")List<String> ids,@Param("uid")String uid);
+    int queryVerifiedNum(@Param("businessKeys")List<String> ids,@Param("uid")String uid);
 
-    int queryOvertimeNum(List<String> businessKeys, String toString);
+    int queryOvertimeNum(@Param("businessKeys")List<String> businessKeys, @Param("uid")String uid);
 }
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..cf45164 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,68 @@
         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 "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
+        bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,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.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"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 )
+            </if>
+            <if test="request.sampleStatus == 8"><!--超期状态，样品在待分发和检测中下的超期-->
+                AND (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 +132,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-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
index 12791f0..5ce4173 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyEquipmentMapper.xml
@@ -10,11 +10,15 @@
             mfa.mesure_range,
             mfa.use_dept,
             mfa.use_person,
+            sd.SIMPLE_NAME as use_dept_name,
+            su.`NAME` as use_person_name,
             mfa.manager_state,
             mfa.valid_date
         FROM
             equipment_apply_equipment msae
-                LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN equipment_fixed_assets mfa on msae.equipment_id = mfa.id
+            LEFT JOIN sys_user su ON su.id = mfa.use_person
+            LEFT JOIN sys_dept sd ON sd.id = mfa.use_dept
         where 1=1 and msae.is_del != 1
         and msae.apply_id = #{id}
     </select>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
index 0c588de..d321998 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml
@@ -66,9 +66,9 @@
             1 = 1
           AND eae.equipment_id IS NOT NULL
           AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
@@ -76,7 +76,7 @@
 
     <select id="queryOvertimeNum" resultType="int">
         SELECT
-        *
+        count( 0 ) AS `count`
         FROM
         equipment_apply ea
         LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id
@@ -86,9 +86,9 @@
         AND eae.equipment_id IS NOT NULL
         AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH )
         AND efa.use_person = #{uid}
-        <if test="ids != null and ids.size() > 0">
+        <if test="businessKeys != null and businessKeys.size() > 0">
             and eae.apply_id in
-            <foreach collection='ids' item='id' open='(' separator=',' close=')'>
+            <foreach collection='businessKeys' item='id' open='(' separator=',' close=')'>
                 #{id}
             </foreach>
         </if>
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..bdbdb1b 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";
     //整体评价
@@ -96,6 +98,12 @@
     //样品所属
     String  SAMPLE_BELONG="sampleBelong";
 
+    //鉴定类别
+    String  MEASURE_CATEGORY="measureCategory";
+
+   //检定方式
+    String  MEASURE_TYPE="measureType";
+
     //样品状态
     String  SAMPLE_STATUS="sampleStatus";
 
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..9abb575 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
@@ -2,6 +2,7 @@
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.NonNull;
 
 @Data
 public class DeviceDispatchDTO {
@@ -25,6 +26,14 @@
     private String sampleBelong;
 
     @ApiModelProperty(value = "样品状态", dataType = "String")
+    @NonNull
     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..6175e65 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
@@ -24,52 +24,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 +79,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/dispatch/DeviceReceiveDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
new file mode 100644
index 0000000..5674fcf
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceReceiveDTO.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.dto.business.dispatch;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("设备接收")
+@Data
+public class DeviceReceiveDTO {
+
+    @ApiModelProperty(value = "委托书id", dataType = "Long")
+    @ExcelProperty(value = "委托书id", order = 0)
+    private  Long orderId;
+
+    @ApiModelProperty(value = "样品id", dataType = "Long")
+    @ExcelProperty(value = "样品id", order = 0)
+    private  Long sampleId;
+
+}
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..4871276 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
@@ -24,113 +24,136 @@
 @ContentRowHeight(20)
 @ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN)
 @ExcelIgnoreUnannotated
-public class CustomerInfoResponse  implements Serializable {
+public class CustomerInfoResponse implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-        private Long id;
+    private Long id;
 
-        @ApiModelProperty(value = "编号", dataType = "String")
-        @ExcelProperty(value = "编号",order = 0)
-        private String customerNo;
+    @ApiModelProperty(value = "编号", dataType = "String")
+    @ExcelProperty(value = "编号", order = 0)
+    private String customerNo;
 
-        @ApiModelProperty(value = "公司名称", dataType = "String")
-        @ExcelProperty(value = "公司名称",order = 1)
-        private String customerName;
+    @ApiModelProperty(value = "公司名称", dataType = "String")
+    @ExcelProperty(value = "公司名称", order = 1)
+    private String customerName;
 
-        @ApiModelProperty(value = "公司简称", dataType = "String")
-        @ExcelProperty(value = "公司简称",order = 2)
-        private String briefName;
+    @ApiModelProperty(value = "公司简称", dataType = "String")
+    @ExcelProperty(value = "公司简称", order = 2)
+    private String briefName;
 
-        @ApiModelProperty(value = "业务内容", dataType = "String")
-        @ExcelProperty(value = "业务内容",order = 3)
-        private String businessContent;
+    @ApiModelProperty(value = "业务内容", dataType = "String")
+    @ExcelProperty(value = "业务内容", order = 3)
+    private String businessContent;
 
-        @ApiModelProperty(value = "税号", dataType = "String")
-        @ExcelProperty(value = "税号",order = 4)
-        private String taxNumber;
+    @ApiModelProperty(value = "税号", dataType = "String")
+    @ExcelProperty(value = "税号", order = 4)
+    private String taxNumber;
 
-        @ApiModelProperty(value = "银行账户名", dataType = "String")
-        @ExcelProperty(value = "银行账户名",order = 5)
-        private String bankAccount;
+    @ApiModelProperty(value = "银行账户名", dataType = "String")
+    @ExcelProperty(value = "银行账户名", order = 5)
+    private String bankAccount;
 
-        @ApiModelProperty(value = "银行名称", dataType = "String")
-        @ExcelProperty(value = "银行名称",order = 6)
-        private String bankName;
+    @ApiModelProperty(value = "银行名称", dataType = "String")
+    @ExcelProperty(value = "银行名称", order = 6)
+    private String bankName;
 
-        @ApiModelProperty(value = "银行账号", dataType = "String")
-        @ExcelProperty(value = "银行账号",order = 7)
-        private String bankAccountNumber;
+    @ApiModelProperty(value = "银行账号", dataType = "String")
+    @ExcelProperty(value = "银行账号", order = 7)
+    private String bankAccountNumber;
 
-        @ApiModelProperty(value = "邮编", dataType = "String")
-        @ExcelProperty(value = "邮编",order = 8)
-        private String postalCode;
+    @ApiModelProperty(value = "邮编", dataType = "String")
+    @ExcelProperty(value = "邮编", order = 8)
+    private String postalCode;
 
-        @ApiModelProperty(value = "负责人", dataType = "String")
-        @ExcelProperty(value = "负责人",order = 9)
-        private String director;
+    @ApiModelProperty(value = "负责人", dataType = "String")
+    @ExcelProperty(value = "负责人", order = 9)
+    private String director;
 
-        @ApiModelProperty(value = "电话", dataType = "String")
-        @ExcelProperty(value = "电话",order = 10)
-        private String phone;
+    @ApiModelProperty(value = "电话", dataType = "String")
+    @ExcelProperty(value = "电话", order = 10)
+    private String phone;
 
-        @ApiModelProperty(value = "传真", dataType = "String")
-        @ExcelProperty(value = "电话",order = 11)
-        private String fax;
+    @ApiModelProperty(value = "传真", dataType = "String")
+    @ExcelProperty(value = "电话", order = 11)
+    private String fax;
 
-        @ApiModelProperty(value = "手机", dataType = "String")
-        @ExcelProperty(value = "手机",order = 12)
-        private String mobile;
+    @ApiModelProperty(value = "手机", dataType = "String")
+    @ExcelProperty(value = "手机", order = 12)
+    private String mobile;
 
-        @ApiModelProperty(value = "邮箱", dataType = "String")
-        @ExcelProperty(value = "邮箱",order = 13)
-        private String email;
+    @ApiModelProperty(value = "邮箱", dataType = "String")
+    @ExcelProperty(value = "邮箱", order = 13)
+    private String email;
 
-        @ApiModelProperty(value = "网址", dataType = "String")
-        @ExcelProperty(value = "网址",order =14)
-        private String website;
+    @ApiModelProperty(value = "网址", dataType = "String")
+    @ExcelProperty(value = "网址", order = 14)
+    private String website;
 
-        @ApiModelProperty(value = "履约评级-字典", dataType = "String")
-        private String grade;
+    @ApiModelProperty(value = "履约评级id", dataType = "String")
+    @DictCodeField(message = "履约评级描述不合法", cacheName = MeterDictCode.GRADE)
+    private String grade;
 
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
-        private String companySize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约评级", dataType = "String")
+    @ExcelProperty(value = "履约评级", order = 15)
+    private String gradeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模", dataType = "String")
-        private String companySizeName;
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    @DictCodeField(message = "公司规模描述不合法", cacheName = MeterDictCode.COMPANY_SCALE)
+    private String companySize;
 
-        @ApiModelProperty(value = "业务规模-字典", dataType = "String")
-        @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
-        private String businessSize;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String companySizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "公司规模名称", dataType = "String")
-        private String businessSizeName;
+    @ApiModelProperty(value = "业务规模-字典", dataType = "String")
+    @DictCodeField(message = "业务规模描述不合法", cacheName = MeterDictCode.BUSINESS_SCALE)
+    private String businessSize;
 
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
-        private String evaluation;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模名称", dataType = "String")
+    private String businessSizeName;
 
-        @TableField(exist = false)
-        @ApiModelProperty(value = "整体评价", dataType = "String")
-        private String evaluationName;
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "公司整体评价不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
 
-        @ApiModelProperty(value = "公司地址-详细地址", dataType = "String")
-        @ExcelProperty(value = "详细地址",order =15)
-        private String fullAddress;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    private String evaluationName;
 
-        @ApiModelProperty(value = "业务范围", dataType = "String")
-        @ExcelProperty(value = "业务范围",order =16)
-        private String businessScope;
 
-        @ApiModelProperty(value = "创建时间", dataType = "String")
-        @ExcelProperty(value = "创建时间",order =17)
-        private String createTime;
+    @ApiModelProperty(value = "公司国家地址", dataType = "String")
+    @ExcelProperty(value = "公司国家地址", order = 16)
+    private String addressCountryName;
 
-        @ApiModelProperty(value = "最后更新时间", dataType = "String")
-        @ExcelProperty(value = "最后更新时间",order =18)
-        private String updateTime;
+    @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 = 19)
+    private String businessScope;
+
+    @ApiModelProperty(value = "创建时间", dataType = "String")
+    @ExcelProperty(value = "创建时间", order = 20)
+    private String createTime;
+
+    @ApiModelProperty(value = "最后更新时间", dataType = "String")
+    @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 95b7ebe..58bbbbb 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
@@ -21,7 +21,7 @@
     private String customerName;
 
     @ApiModelProperty(value = "业务规模", dataType = "String")
-    private String bussinessSize;
+    private String businessSize;
 
     /**
      * 导出ids
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
index 9cf0635..7743414 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/AcceptanceCheck.java
@@ -153,4 +153,10 @@
     @ApiModelProperty(value = "附件列表", dataType = "List")
     List<EquipmentApplyFile> fileList;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
index 5a92457..24ff4b5 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java
@@ -189,4 +189,10 @@
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
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..61a9e8b 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,8 +28,9 @@
     private static final long serialVersionUID = 1L;
 
     private Long id;
+
     @ApiModelProperty(value = "编号", dataType = "String")
-    @ExcelProperty(value = "反馈编号",order = 0)
+    @ExcelProperty(value = "反馈编号", order = 0)
     private String adviceNo;
 
     @ApiModelProperty(value = "投诉类型-字典", dataType = "String")
@@ -41,37 +42,37 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "投诉类型名称", dataType = "String")
-    @ExcelProperty(value = "投诉类别",order = 1)
+    @ExcelProperty(value = "投诉类别", order = 1)
     private String adviceTypeName;
 
     @ApiModelProperty(value = "投诉人", dataType = "String")
-    @ExcelProperty(value = "投诉人",order = 2)
+    @ExcelProperty(value = "投诉人", order = 2)
     private String advicePerson;
 
     @ApiModelProperty(value = "投诉人联系方式", dataType = "String")
-    @ExcelProperty(value = "投诉人联系方式",order = 3)
+    @ExcelProperty(value = "投诉人联系方式", order = 3)
     private String personPhone;
 
     @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 customerName;
 
     @ApiModelProperty(value = "客户id", dataType = "String")
     private Long customerId;
 
     @ApiModelProperty(value = "投诉内容", dataType = "String")
-    @ExcelProperty(value = "投诉内容",order = 6)
+    @ExcelProperty(value = "投诉内容", order = 6)
     private String content;
 
     @ApiModelProperty(value = "处置状态-0未处置，1已处置", dataType = "String")
     private String handleStatus;
 
     @ApiModelProperty(value = "处置意见", dataType = "String")
-    @ExcelProperty(value = "处置意见",order = 7)
+    @ExcelProperty(value = "处置意见", order = 7)
     private String handleMessage;
 
     @ApiModelProperty(value = "创建用户id", dataType = "Long")
@@ -84,14 +85,37 @@
     private Integer isDel;
 
     @ApiModelProperty(value = "投诉时间", dataType = "String")
-    @ExcelProperty(value = "投诉时间",order = 8)
+    @ExcelProperty(value = "投诉时间", order = 8)
     private String adviceTime;
 
     @ApiModelProperty(value = "创建时间", dataType = "String")
-    @ExcelProperty(value = "创建时间",order = 9)
+    @ExcelProperty(value = "创建时间", order = 9)
     private String createTime;
 
     @ApiModelProperty(value = "最后更新时间", dataType = "String")
-    @ExcelProperty(value = "最后更新时间",order = 10)
+    @ExcelProperty(value = "最后更新时间", order = 10)
     private String updateTime;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "公司规模", dataType = "String")
+    private String businessSize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "业务规模", dataType = "String")
+    private String companySize;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "履约等级", dataType = "String")
+    private String grade;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价", dataType = "String")
+    @DictCodeField(message = "整体评价描述不合法", cacheName = MeterDictCode.EVALUATION)
+    private String evaluation;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "整体评价名称", dataType = "String")
+    @ExcelProperty(value = "整体评价名称", order = 11)
+    private String evaluationName;
+
 }
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 e1b7bce..beb1f86 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
@@ -71,15 +71,32 @@
     @ApiModelProperty(value = " 客户特殊要求", dataType = "String")
     private String specialRequire;
 
-    @ApiModelProperty(value = " 检校类别-字典", dataType = "String")
+
+    @ApiModelProperty(value = " 检定方式", dataType = "String")
+    @DictCodeField(message = "检定方式", cacheName = MeterDictCode.MEASURE_TYPE)
+    private String measureType;
+
+    @ApiModelProperty(value = " 检定方式名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureTypeName;
+
+    @ApiModelProperty(value = " 检校类别", dataType = "String")
+    @DictCodeField(message = "检校类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
     private String measureCategory;
 
+    @ApiModelProperty(value = " 检校类别名称", dataType = "String")
+    @TableField(exist = false)
+    private String measureCategoryName;
+
     @ApiModelProperty(value = "检定项目", dataType = "String")
     private String measureContent;
 
     @ApiModelProperty(value = "检定周期(月)", dataType = "String")
     private String measurePeriod;
 
+    @ApiModelProperty(value = "检定日期", dataType = "String")
+    private String measureLastTime;
+
     @ApiModelProperty(value = "有效期限", dataType = "String")
     private String validDeadline;
 
@@ -107,6 +124,24 @@
     @ApiModelProperty(value = "更新时间", dataType = "String")
     private String updateTime;
 
+    @ApiModelProperty(value = "送检人", dataType = "String")
+    private String deliverer;
+
+    @ApiModelProperty(value = "送检人联系方式", dataType = "String")
+    private String delivererTel;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方地址", dataType = "String")
+    private String customerAddress;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方电话", dataType = "String")
+    private String phone;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "委托方邮编", dataType = "String")
+    private String postalCode;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "是否存在样品库（0-不存在,1-存在）", dataType = "String")
     private String isExistSample;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
index 704ae7b..2ecd626 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApply.java
@@ -233,4 +233,10 @@
     @ApiModelProperty(value = "检修申请id", dataType = "String")
     private String acceptanceCheckId;
 
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
+
 }
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
index fe6f858..6319a37 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardApply.java
@@ -222,4 +222,10 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "任务id（同意、驳回等操作使用）", dataType = "String")
     private String taskId;
+
+    /**
+     * 可选决策项
+     */
+    @ApiModelProperty(value = "可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）", dataType = "Integer")
+    private Integer decisionItem;
 }
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 2e86a7d..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
@@ -12,7 +12,6 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.business.interchange.InterchangeListRequest;
 import com.casic.missiles.dto.business.interchange.InterchangeListResponse;
-import com.casic.missiles.dto.business.order.OrderListReponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
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 4c9d57a..a136bd1 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
@@ -130,9 +130,13 @@
         this.sampleStatusDeletor(businessOrder.getId());
         this.doSampleListPopulation(businessOrder);
         for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) {
+            sampleInfo.setDeliverer(businessOrder.getDeliverer());
             if (sampleInfo.getIsExistSample().equals("0")) {
                 ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo);
                 sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
+            }else {
+                ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo);
+                sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200;
             }
             sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0;
         }
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 556a092..4fac180 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,19 @@
 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.dto.business.dispatch.DeviceReceiveDTO;
+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;
@@ -22,7 +22,10 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -30,29 +33,88 @@
 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<DeviceDispatchVO> dispatchVOPage = orderSampleRelationMapper.getSampleListByStatus(page, request);
-//        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:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                            //检测中状态，分发性质:无，当前检定环节:具体实验室，已出具证书：查询证书报告表，证书总数：具体实验室
+                        case SampleStatusEnum.IN_MEASURE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //检测完状态，分发性质:无，当前检定环节:完成，已出具证书：无，出具证书总数:无
+                        case SampleStatusEnum.MEASURE_COMPLETE:
+                            doDispatchVOPopulation(dispatchVO, sampleId, orderId);
+                            break;
+                        //超期样品（即检测超期，未在应检完时间检完），分发性质:无，当前检定环节:待分配/具体实验室，已出具证书：查询证书报告表(具体实验室)，出具证书总数：具体实验室
+                        case SampleStatusEnum.BE_OVERDUE:
+                            if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_INCOME);
+                                break;
+                            }
+                            if (SampleStatusEnum.TO_HANDOUT.equals(dispatchVO.getSampleStatus())) {
+                                dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+                                break;
+                            }
+                            HandOutLabExecutiveDTO overLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+                            dispatchVO.setCurrentSegment(overLabExecutiveDTO.getDeptName());
+                            Long deptId = overLabExecutiveDTO.getMeasureDeptId();
+                            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, deptId));
+                            dispatchVO.setRequireCertifications(overLabExecutiveDTO.getRequireCertifications());
+                            break;
+                    }
+                }
+        );
         return page;
     }
 
+
+    private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) {
+        dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE);
+        List<BusinessLabExecutiveOperateLog> sendBackOperateLogs = labExecutiveOperateLogMapper.selectList(getOperateLogWrapper(dispatchVO));
+        HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId);
+        if (!Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications());
+            dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName());
+        }
+        if (CollectionUtils.isEmpty(sendBackOperateLogs)&& !Objects.isNull(handOutLabExecutiveDTO)) {
+            dispatchVO.setFallbackState(0);//不可以进行回退
+            Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId();
+            dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId));
+        } else {
+            dispatchVO.setFallbackState(1);//可以进行回退
+            dispatchVO.setAlreadyCertifications(0);
+        }
+    }
+
     @Override
     public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) {
 
+
     }
 
     @Override
-    public ReturnDTO receiveDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public  ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO){
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -60,8 +122,8 @@
     }
 
     @Override
-    public ReturnDTO backDevice(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -69,8 +131,8 @@
     }
 
     @Override
-    public ReturnDTO forcedTerminate(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
@@ -78,11 +140,54 @@
     }
 
     @Override
-    public ReturnDTO rushDoProcess(Long id) {
-        Integer deleteFalg = this.baseMapper.deleteById(id);
+    public ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
         if (deleteFalg > 0) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
+
+    @Override
+    public ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO) {
+        Integer deleteFalg = this.baseMapper.deleteById(deviceReceiveDTO.getOrderId());
+        if (deleteFalg > 0) {
+            return ReturnUtil.success();
+        }
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+
+
+    private QueryWrapper<BusinessLabExecutiveOperateLog> getOperateLogWrapper(DeviceDispatchVO deviceDispatchVO) {
+        QueryWrapper<BusinessLabExecutiveOperateLog> wrapper = new QueryWrapper<>();
+        wrapper.eq("order_id", deviceDispatchVO.getOrderId());
+        wrapper.eq("sample_id", deviceDispatchVO.getSampleId());
+        wrapper.eq("measure_status", MeasureStatusEnum.MEASURE_COMPLETE)
+                .or().eq("measure_status", 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;
+        }
+        Optional<HandOutLabExecutiveDTO> handOutLabExecutiveDTOOptional = labExecutiveList.stream().findFirst();
+        return handOutLabExecutiveDTOOptional.isPresent() ? handOutLabExecutiveDTOOptional.get() : null;
+    }
+
+    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 938d725..626c209 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
@@ -13,7 +13,9 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerAdviceMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.model.customer.CustomerAdviceInfo;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.service.customer.CustomerAdviceService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
@@ -22,6 +24,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -33,12 +36,14 @@
 
     private final CustomerAdviceMapper customerAdviceMapper;
     private final IBaseExportService iBaseExportService;
+    private final CustomerMapper customerMapper;
 
     @Override
     public Page<CustomerAdviceInfo> adviceListPage(Page<CustomerAdviceInfo> page, CustomerAdviceListRequest customerAdviceListRequest) throws Exception {
         QueryWrapper<CustomerAdviceInfo> wrapper = listParamWrapper(customerAdviceListRequest);
         Page<CustomerAdviceInfo> resultPage = customerAdviceMapper.selectPage(page, wrapper);
         for (CustomerAdviceInfo customerAdviceInfo : resultPage.getRecords()) {
+            doCustomerAdviceInfoPopulation(customerAdviceInfo);
             DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
         }
         return resultPage;
@@ -47,6 +52,7 @@
     @Override
     public CustomerAdviceInfo adviceDetail(Long id) {
         CustomerAdviceInfo customerAdviceInfo = customerAdviceMapper.selectById(id);
+        doCustomerAdviceInfoPopulation(customerAdviceInfo);
         return customerAdviceInfo;
     }
 
@@ -89,6 +95,7 @@
                 customerAdviceList = customerAdviceMapper.selectList(wrapper);
             }
             for (CustomerAdviceInfo customerAdviceInfo : customerAdviceList) {
+                doCustomerAdviceInfoPopulation(customerAdviceInfo);
                 DictCodeUtils.convertDictCodeToName(customerAdviceInfo);
             }
             iBaseExportService.exportExcel(response, CustomerAdviceInfo.class, customerAdviceList, ExportEnum.ADVICE_EXPORT.getSheetName());
@@ -118,4 +125,14 @@
         customerAdviceInfo.setUpdateUser(authUser.getId());
         customerAdviceInfo.setAdviceNo(adviceNo);
     }
+
+    private void doCustomerAdviceInfoPopulation(CustomerAdviceInfo customerAdviceInfo) {
+        CustomerInfo customerInfo  =customerMapper.selectById(customerAdviceInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerAdviceInfo.setCompanySize(customerInfo.getCompanySize());
+            customerAdviceInfo.setBusinessSize(customerInfo.getBusinessSize());
+            customerAdviceInfo.setEvaluation(customerInfo.getEvaluation());
+            customerAdviceInfo.setGrade(customerInfo.getGrade());
+        }
+    }
 }
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 c4f6cb8..28082ec 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
@@ -17,11 +17,13 @@
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
+import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.mapper.customer.customize.MesureRecordsResponseMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
+import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import com.casic.missiles.service.customer.CustomerSampleService;
 import com.casic.missiles.utils.DictCodeUtils;
@@ -44,6 +46,7 @@
 public class CustomerSampleServiceImpl extends ServiceImpl<CustomerSampleMapper, CustomerSampleInfo> implements CustomerSampleService {
 
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
+    private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
     private final CertificationResponseMapper certificationResponseMapper;
     private final MesureRecordsResponseMapper mesureResponseMapper;
@@ -98,6 +101,9 @@
     @Override
     public CustomerSampleInfo sampleDetail(Long id) {
         CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id);
+        if(!ObjectUtils.isEmpty(customerSampleInfo)){
+            doCustomerSampleInfoPopulation(customerSampleInfo);
+        }
         return customerSampleInfo;
     }
 
@@ -113,8 +119,8 @@
             List<CustomerSampleListResponse> customerSampleList;
             List<BusinessOrderSampleRelation> businessOrderList = sampleRelationMapper.selectList(null);
             Map<Long, BusinessOrderSampleRelation> businessOrderMap = businessOrderList.stream()
-                    .collect(Collectors.toMap(e -> e.getSampleId(),e->e,
-                            ( value1,value2) ->value1));
+                    .collect(Collectors.toMap(e -> e.getSampleId(), e -> e,
+                            (value1, value2) -> value1));
             if (!CollectionUtils.isEmpty(request.getIds())) {
                 customerSampleList = customerSampleListResponseMapper.selectBatchIds(request.getIds());
             } else {
@@ -211,12 +217,13 @@
         return queryWrapper;
     }
 
-//    private Long orderBuilder(Long sampleId) {
-//        QueryWrapper<BusinessOrderSampleRelation> sampleStatusRelationWrapper = new QueryWrapper<BusinessOrderSampleRelation>()
-//                .eq("sample_id", sampleId);
-//        List<BusinessOrderSampleRelation> sampleStatusList = this.sampleRelationMapper.selectList(sampleStatusRelationWrapper);
-//        Optional<BusinessOrderSampleRelation> optionalSampleRelation = sampleStatusList.stream().findFirst();
-//        return optionalSampleRelation.isPresent() ? optionalSampleRelation.get().getOrderId() : Long.valueOf("-1");
-//    }
+    private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) {
+        CustomerInfo  customerInfo  =customerMapper.selectById(customerSampleInfo.getCustomerId());
+        if(!ObjectUtils.isEmpty(customerInfo)){
+            customerSampleInfo.setPhone(customerInfo.getPhone());
+            customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress());
+            customerSampleInfo.setPostalCode(customerInfo.getPostalCode());
+        }
+    }
 
 }
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 45b17dc..62c4a00 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
@@ -20,7 +20,6 @@
 import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
-import com.casic.missiles.model.customer.CustomerAdviceInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
 import com.casic.missiles.model.customer.CustomerUserInfo;
 import com.casic.missiles.service.customer.CustomerService;
@@ -58,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);
@@ -74,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 = userInfoListCreator(customerInfo.getCustomerUserList(),customerInfo.getId());
         if (updateFlag > 0 && userUpdateFlag) {
             return ReturnUtil.success();
         }
@@ -91,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();
         }
@@ -112,7 +124,6 @@
     @Override//暂定不做
     public Page<ContractRecordsResponse> contractRecordsByCustomerId(Long customerId) {
         Page<ContractRecordsResponse> contractRecordsResponsePage = PageFactory.defaultPage();
-
         return contractRecordsResponsePage;
     }
 
@@ -140,7 +151,7 @@
                 customerInfoList = customerInfoResponseMapper.selectBatchIds(request.getIds());
             } else {
                 QueryWrapper<CustomerInfoResponse> wrapper = listParamWrapper(request);
-               customerInfoList =customerInfoResponseMapper.selectList(wrapper);
+                customerInfoList = customerInfoResponseMapper.selectList(wrapper);
             }
             for (CustomerInfoResponse customerInfo : customerInfoList) {
                 DictCodeUtils.convertDictCodeToName(customerInfo);
@@ -155,9 +166,10 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         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.getBusinessSize()), "bussiness_size", request.getBusinessSize());
         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;
     }
 
@@ -177,15 +189,10 @@
         return customerUserInfoList;
     }
 
-    private Boolean userInfoListEditor(List<CustomerUserInfo> userInfoList) {
-        Boolean userUpdateFlag = true;
-        for (CustomerUserInfo customerUserInfo : userInfoList) {
-            Integer userUpdateNum = customerUserMapper.updateById(customerUserInfo);
-            if (userUpdateNum <= 0) {
-                userUpdateFlag = false;
-            }
-        }
-        return userUpdateFlag;
+    private void userInfoListDeletor(Long customerId) {
+        QueryWrapper<CustomerUserInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("customer_id", customerId);
+        customerUserMapper.delete(queryWrapper);
     }
 
     private Boolean userInfoListCreator(List<CustomerUserInfo> userInfoList, Long id) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
index ab1ff2e..037eaae 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.service.Impl.equipment;
 
 import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.service.IBaseExportService;
@@ -32,11 +31,13 @@
 import com.casic.missiles.service.equipment.IEquipmentApplyFileService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -45,6 +46,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("IEquipmentAcceptanceCheckService")
 public class EquipmentApplyAcceptanceCheckServiceImpl implements IEquipmentAcceptanceCheckService {
 
@@ -84,6 +86,7 @@
         List<String> businessKeys = new ArrayList<>();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         String status = request.getApprovalStatus();
         switch (status){
             // 待审批 获取业务id,以及taskId
@@ -91,6 +94,7 @@
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             // 审批中
             case ApprovalStatusEnum.IN_APPROVED:
@@ -145,16 +149,13 @@
             // 待审批状态-赋值taskId
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<AcceptanceCheck> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(AcceptanceCheck::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -178,6 +179,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -196,16 +198,15 @@
             if(null != equipmentApply.getFileList() && equipmentApply.getFileList().size() != 0){
                 equipmentApply.getFileList().forEach(bean->bean.setApplyId(equipmentApply.getId()));
                 boolean flag = equipmentApplyFileService.saveBatch(equipmentApply.getFileList());
-                if(!flag){
-                    return ReturnUtil.failed("新增失败");
-                }
+                if(!flag) throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
             }
             return ReturnUtil.success(equipmentApply.getId());
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) {
         // 编辑验收报验单基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -214,7 +215,7 @@
         if(updateFlg>0 && saveOrUpdateBatch){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -231,12 +232,14 @@
             }
             iBaseExportService.exportExcel(response, AcceptanceCheck.class,resultList, ExportEnum.METER_ACCEPTANCE_CHECK.getSheetName());
         } catch (IOException e) {
+            log.error("样品导出出现异常，异常信息为:", e);
             e.printStackTrace();
         }
 
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
index dc79adf..5a160b7 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java
@@ -6,6 +6,7 @@
 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.page.PageFactory;
 import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.BaseApprovalSubmitRequest;
 import com.casic.missiles.dto.IdDTO;
@@ -38,6 +39,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -81,12 +83,14 @@
         boolean searchBusinessKey = true;
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         switch (status){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
                 businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -133,16 +137,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 equipmentApply.setTaskId(taskMap.get(equipmentApply.getId().toString()));
+                equipmentApply.setDecisionItem(decisionItemMap.get(equipmentApply.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 equipmentApply.setApprovalStatus(taskMap.get(String.valueOf(equipmentApply.getId())));
             }
             DictCodeUtils.convertDictCodeToName(equipmentApply);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -154,11 +155,15 @@
         DictCodeUtils.convertDictCodeToName(equipmentApply);
         // 查询设备详细信息
         List<EquipmentFixedAssets> fixedAssetsList = equipmentMapper.queryEquipmentList(idDTO.getId());
+        for (EquipmentFixedAssets equipmentFixedAssets : fixedAssetsList) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         equipmentApply.setEquipmentInfoList(fixedAssetsList);
         return equipmentApply;
     }
 
     @Override
+    @Transactional
     public ReturnDTO addEquipmentApply(EquipmentApply equipmentApply) {
         Long maxNo = equipmentApplyMapper.selectMaxNo();
         // 生成编号
@@ -189,11 +194,10 @@
             }
             if(equipmentSaveBatchFlg && saveBatchFlg){
                 return ReturnUtil.success(id);
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
@@ -222,6 +226,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -239,10 +244,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateEquipmentApply(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -259,20 +265,22 @@
             if(saveOrUpdateBatchFlg){
                 return ReturnUtil.success();
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public void exportList(EquipmentApplyRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentApply> resultList;
+
         // 判断是否为通过ids导出
         if(!CollectionUtils.isEmpty(request.getIds())){
-            resultList = this.listByIds(request.getIds());
+            EquipmentApplyRequest applyRequest = new EquipmentApplyRequest();
+            applyRequest.setIds(request.getIds());
+            resultList = equipmentApplyMapper.equipmentApplyList(applyRequest);
         }else{
-            List<String> businessKeys = baseApprovalService.getPassedList(request.getFormId());
-            request.setBusinessKeys(businessKeys);
+            request.setBusinessKeys(getBusinessKeys(request));
             resultList = equipmentApplyMapper.equipmentApplyList(request);
         }
         for (EquipmentApply equipmentApply : resultList) {
@@ -285,21 +293,21 @@
     public ReturnDTO borrowEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
         // 通过id修改处理结果
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_BORROWED);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("借用失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
     public ReturnDTO returnEquipmentApply(IdDTO idDto) {
         UpdateWrapper<EquipmentApply> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN.getCode());
+        updateWrapper.eq("id",idDto.getId()).set("process_result", EquipmentApplyProcessEnum.ALREADY_RETURN);
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("归还失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -309,10 +317,11 @@
         if(equipmentApplyMapper.update(null, updateWrapper)>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("处理失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO submitEquipmentApply(BaseApprovalSubmitRequest request) {
         String formId = request.getFormId();
         // 发起流程
@@ -335,6 +344,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentApply equipmentApply) {
         // 修改申请基本信息
         int updateFlg = equipmentApplyMapper.updateById(equipmentApply);
@@ -358,8 +368,43 @@
                 //更新状态为审批中
                 runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             }
-            return ReturnUtil.failed("修改失败");
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
+    }
+    private List<String> getBusinessKeys(EquipmentApplyRequest request) {
+        List<String> businessKeys;
+        List<String> rejectBusinessKey;
+        switch (request.getApprovalStatus()) {
+            case ApprovalStatusEnum.TO_BE_APPROVED:
+                List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
+                businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            case ApprovalStatusEnum.IN_APPROVED:
+                businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.PASSED:
+                businessKeys = baseApprovalService.getPassedList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.FAILED:
+                businessKeys = baseApprovalService.getFailedList(request.getFormId());
+                rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                businessKeys.addAll(rejectBusinessKey);
+                break;
+            case ApprovalStatusEnum.CANCELED:
+                businessKeys = baseApprovalService.getCanceledList(request.getFormId());
+                break;
+            case ApprovalStatusEnum.ALL:
+                List<AllApproveDTO> allList = baseApprovalService.getAllList(request.getFormId());
+                businessKeys = allList.stream().map(AllApproveDTO::getBusinessKey).distinct().collect(Collectors.toList());
+                break;
+            default:
+                businessKeys = new ArrayList<>();
+                break;
+        }
+        if(!request.getApprovalStatus().equals(ApprovalStatusEnum.DRAFT)){
+            request.setApprovalStatus(null);
+        }
+        return businessKeys;
     }
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
index 52f97d8..7c4fdbc 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentCheckInfoServiceImpl.java
@@ -8,7 +8,9 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.equipment.CheckInfoRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentCheckInfoMapper;
 import com.casic.missiles.model.equipment.EquipmentCheckInfo;
@@ -19,6 +21,7 @@
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -58,7 +61,7 @@
         if(equipmentCheckInfoMapper.deleteById(idDto.getId())>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -73,6 +76,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addCheckInfo(EquipmentCheckInfo equipmentCheckInfo) {
         long maxNo = equipmentCheckInfoMapper.selectMaxNo();
         String checkNo = NumberGeneratorUtil.getContactNo("jc", maxNo);
@@ -85,11 +89,10 @@
             boolean saveBatchFlg = checkInfoFileService.saveBatch(equipmentCheckInfo.getFileList());
             if(saveBatchFlg){
                 return ReturnUtil.success();
-            }else{
-                return ReturnUtil.failed("附件添加失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
index ebd8ff6..6225d4e 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java
@@ -35,6 +35,7 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -95,6 +96,7 @@
         String status = request.getApprovalStatus();
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -102,6 +104,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -146,16 +149,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<EquipmentStandardApply> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(EquipmentStandardApply::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
@@ -165,6 +165,9 @@
         EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId());
         // 通过申请标准装置id获取标准装置详细信息
         EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId());
+        if(ObjectUtil.isEmpty(standardEquipment)){
+            throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST);
+        }
         DictCodeUtils.convertDictCodeToName(standardEquipment);
         result.setMeterStandardEquipment(standardEquipment);
         QueryWrapper<EquipmentStandardApplyEquipment> wrapper = new QueryWrapper<>();
@@ -177,7 +180,7 @@
         }
         // 通过对应设备id查询设备详细信息
         QueryWrapper<EquipmentFixedAssets> fixedAssetsWrapper = new QueryWrapper<>();
-        if(CollectionUtils.isEmpty(equipmentIds)){
+        if(!CollectionUtils.isEmpty(equipmentIds) && equipmentIds.size()!=0){
             fixedAssetsWrapper.in("id", equipmentIds);
             List<EquipmentFixedAssets> meterFixedAssets = meterFixedAssetsMapper.selectList(fixedAssetsWrapper);
             result.setFixedAssetsList(meterFixedAssets);
@@ -191,6 +194,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         Long maxNo = meterStandardApplyMapper.selectMaxNo();
         String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo);
@@ -217,21 +221,21 @@
             }
             if(fileListResult&&equipmentListResult){
                 return ReturnUtil.success(meterStandardApply.getId());
-            }else {
-                return ReturnUtil.failed("新增失败");
             }
+            throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
-        return ReturnUtil.failed("操作失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
         if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
@@ -268,6 +272,7 @@
     }
 
     @Override
+    @Transactional
     public ReturnDTO approvalDelete(ApprovalDeleteRequest request) {
         int flag = 0;
         // 审批操作-删除
@@ -285,10 +290,11 @@
         if(flag>0){
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("删除失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     @Override
+    @Transactional
     public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) {
         boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList());
         boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList());
@@ -303,7 +309,7 @@
             runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED);
             return ReturnUtil.success();
         }
-        return ReturnUtil.failed("编辑失败");
+        throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
     }
 
     private String getApplyNoPrefix(String applyType){
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
index b1b937c..047f173 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java
@@ -48,6 +48,7 @@
         String status = request.getApprovalStatus();
         Map<String,String> taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用
         List<String> rejectBusinessKey = new ArrayList<>();// 未通过-驳回
+        Map<String,Integer> decisionItemMap = new HashMap<>(); // 可选决策项map
         switch (request.getApprovalStatus()){
             case ApprovalStatusEnum.TO_BE_APPROVED:
                 List<ToBeApprovedDTO> toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId());
@@ -55,6 +56,7 @@
                     businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).distinct().collect(Collectors.toList());
                 }
                 toBeApprovedList.forEach(toBeApprovedDTO -> {taskMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getTaskId());});
+                toBeApprovedList.forEach(toBeApprovedDTO -> {decisionItemMap.put(toBeApprovedDTO.getBusinessKey(),toBeApprovedDTO.getDecisionItem());});
                 break;
             case ApprovalStatusEnum.IN_APPROVED:
                 businessKeys = baseApprovalService.getInApprovedList(request.getFormId());
@@ -99,16 +101,13 @@
             }
             if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){
                 item.setTaskId(taskMap.get(item.getId().toString()));
+                item.setDecisionItem(decisionItemMap.get(item.getId().toString()));
             }
             if(ApprovalStatusEnum.ALL.equals(status)){
                 item.setApprovalStatus(taskMap.get(String.valueOf(item.getId())));
             }
             DictCodeUtils.convertDictCodeToName(item);
         }
-        if(ApprovalStatusEnum.ALL.equals(status) && !CollectionUtils.isEmpty(resultPage.getRecords())){
-            List<StateManageResponse> collect = resultPage.getRecords().stream().sorted(Comparator.comparing(StateManageResponse::getCreateTime).reversed()).collect(Collectors.toList());
-            resultPage.setRecords(collect);
-        }
         return resultPage;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
index d3f8c1e..8493995 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java
@@ -174,7 +174,7 @@
     }
 
     @Override
-    public ReturnDTO<EquipmentWorkbenchResponse> myselfEquipment() {
+    public ReturnDTO myselfEquipment() {
         EquipmentWorkbenchResponse response = new EquipmentWorkbenchResponse();
         AuthUser user = ShiroKit.getUser();
         Assert.isFalse(Objects.isNull(user), () -> {
@@ -182,9 +182,14 @@
         });
         // 待检定数量
         List<String> businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL));
-        response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString()));
-        equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString());
-        return null;
+        if(businessKeys.size()==0){
+            response.setVerifiedNum(0);
+            response.setOvertimeNum(0);
+        }else {
+            response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys, String.valueOf(user.getId())));
+            response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys, String.valueOf(user.getId())));
+        }
+        return  ReturnUtil.success(response);
     }
 
     public List<EquipmentWorkbenchResponse> getResultList(List<EquipmentWorkbenchResponse> resList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
index 17f4fe9..418298f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java
@@ -854,6 +854,16 @@
     protected static EndEvent createEndEvent() {
         EndEvent endEvent = new EndEvent();
         endEvent.setId(id("end"));
+        // 事件结束监听器
+        ArrayList<FlowableListener> listeners = new ArrayList<>();
+        FlowableListener listener = new FlowableListener();
+        // 结束节点开始时
+        listener.setEvent((ExecutionListener.EVENTNAME_START));
+        // 监听器类型
+        listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_CLASS);
+        listener.setImplementation("com.casic.missiles.listeners.flowable.ProcessUpdateStateListener");
+        listeners.add(listener);
+        endEvent.setExecutionListeners(listeners);
         return endEvent;
     }
 
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
index 6ae3aa2..2fc354d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java
@@ -4,6 +4,7 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO;
 import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO;
+import com.casic.missiles.dto.business.dispatch.DeviceReceiveDTO;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,11 +14,13 @@
 
     void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response);
 
-    ReturnDTO receiveDevice(Long id);
+    ReturnDTO cancelMeasure(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO backDevice(Long id);
+    ReturnDTO receiveDevice(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO forcedTerminate(Long id);
+    ReturnDTO backDevice(DeviceReceiveDTO deviceReceiveDTO);
 
-    ReturnDTO rushDoProcess(Long id);
+    ReturnDTO forcedTerminate(DeviceReceiveDTO deviceReceiveDTO);
+
+    ReturnDTO rushDoProcess(DeviceReceiveDTO deviceReceiveDTO);
 }
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);