diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 6ea28a6..ed478a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessOrderService;
@@ -90,7 +91,6 @@
             DictCodeUtils.convertDictCodeToName(response);
         }
         return responseList;
-
     }
 
     @Override
@@ -203,10 +203,11 @@
     }
 
     @Override
-    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) {
+    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception {
         BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail();
         BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id);
         if (siteExecutiveInfo != null) {
+
             //查询是否有关联的检测人员
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
@@ -218,6 +219,9 @@
         businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class);
         BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId());
         populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder);
+        for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         return businessSiteExecutiveDetail;
     }
 
@@ -282,17 +286,12 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                //提前合并，分页统一处理
+                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
-                List<SiteExecutiveApprovalListResponse> rejectApprovalList = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED_REJECT);
-                }
-                //合并未通过-拒绝和未通过-驳回
-                approvalList.addAll(rejectApprovalList);
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 6ea28a6..ed478a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessOrderService;
@@ -90,7 +91,6 @@
             DictCodeUtils.convertDictCodeToName(response);
         }
         return responseList;
-
     }
 
     @Override
@@ -203,10 +203,11 @@
     }
 
     @Override
-    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) {
+    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception {
         BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail();
         BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id);
         if (siteExecutiveInfo != null) {
+
             //查询是否有关联的检测人员
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
@@ -218,6 +219,9 @@
         businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class);
         BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId());
         populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder);
+        for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         return businessSiteExecutiveDetail;
     }
 
@@ -282,17 +286,12 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                //提前合并，分页统一处理
+                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
-                List<SiteExecutiveApprovalListResponse> rejectApprovalList = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED_REJECT);
-                }
-                //合并未通过-拒绝和未通过-驳回
-                approvalList.addAll(rejectApprovalList);
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index ad1cc40..3aaaf07 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -6,12 +6,16 @@
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -28,6 +32,10 @@
     @Resource
     private MeterStaffMapper meterStaffMapper;
 
+    @Autowired
+    private IDeptService deptService;
+
+
     @Override
     public boolean saveBatch(Long siteExecutiveId, List<MeterStaff> meterStaffList) {
         //先删除所有的绑定关系
@@ -48,8 +56,15 @@
         QueryWrapper<BusinessSiteExecutiveStaffRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("site_executive_id", siteExecutiveId);
         List<BusinessSiteExecutiveStaffRelation> list = this.baseMapper.selectList(queryWrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> deptMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         if (list != null && list.size() > 0) {
-            return meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            List<MeterStaff> meterStaffList = meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            meterStaffList.forEach(
+                    meterStaff -> meterStaff.setDeptName(deptMap.get(Long.valueOf(meterStaff.getDeptId())))
+                    );
+            return meterStaffList;
         }
         return null;
     }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 6ea28a6..ed478a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessOrderService;
@@ -90,7 +91,6 @@
             DictCodeUtils.convertDictCodeToName(response);
         }
         return responseList;
-
     }
 
     @Override
@@ -203,10 +203,11 @@
     }
 
     @Override
-    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) {
+    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception {
         BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail();
         BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id);
         if (siteExecutiveInfo != null) {
+
             //查询是否有关联的检测人员
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
@@ -218,6 +219,9 @@
         businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class);
         BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId());
         populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder);
+        for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         return businessSiteExecutiveDetail;
     }
 
@@ -282,17 +286,12 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                //提前合并，分页统一处理
+                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
-                List<SiteExecutiveApprovalListResponse> rejectApprovalList = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED_REJECT);
-                }
-                //合并未通过-拒绝和未通过-驳回
-                approvalList.addAll(rejectApprovalList);
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index ad1cc40..3aaaf07 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -6,12 +6,16 @@
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -28,6 +32,10 @@
     @Resource
     private MeterStaffMapper meterStaffMapper;
 
+    @Autowired
+    private IDeptService deptService;
+
+
     @Override
     public boolean saveBatch(Long siteExecutiveId, List<MeterStaff> meterStaffList) {
         //先删除所有的绑定关系
@@ -48,8 +56,15 @@
         QueryWrapper<BusinessSiteExecutiveStaffRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("site_executive_id", siteExecutiveId);
         List<BusinessSiteExecutiveStaffRelation> list = this.baseMapper.selectList(queryWrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> deptMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         if (list != null && list.size() > 0) {
-            return meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            List<MeterStaff> meterStaffList = meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            meterStaffList.forEach(
+                    meterStaff -> meterStaff.setDeptName(deptMap.get(Long.valueOf(meterStaff.getDeptId())))
+                    );
+            return meterStaffList;
         }
         return null;
     }
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 81a4204..4858271 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
@@ -198,7 +198,7 @@
     }
 
     @Override
-    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request) throws Exception {
+    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.listPageBySubpackageCertificate(page, request));
         for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(multiItemSampleResponse);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 6ea28a6..ed478a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessOrderService;
@@ -90,7 +91,6 @@
             DictCodeUtils.convertDictCodeToName(response);
         }
         return responseList;
-
     }
 
     @Override
@@ -203,10 +203,11 @@
     }
 
     @Override
-    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) {
+    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception {
         BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail();
         BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id);
         if (siteExecutiveInfo != null) {
+
             //查询是否有关联的检测人员
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
@@ -218,6 +219,9 @@
         businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class);
         BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId());
         populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder);
+        for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         return businessSiteExecutiveDetail;
     }
 
@@ -282,17 +286,12 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                //提前合并，分页统一处理
+                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
-                List<SiteExecutiveApprovalListResponse> rejectApprovalList = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED_REJECT);
-                }
-                //合并未通过-拒绝和未通过-驳回
-                approvalList.addAll(rejectApprovalList);
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index ad1cc40..3aaaf07 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -6,12 +6,16 @@
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -28,6 +32,10 @@
     @Resource
     private MeterStaffMapper meterStaffMapper;
 
+    @Autowired
+    private IDeptService deptService;
+
+
     @Override
     public boolean saveBatch(Long siteExecutiveId, List<MeterStaff> meterStaffList) {
         //先删除所有的绑定关系
@@ -48,8 +56,15 @@
         QueryWrapper<BusinessSiteExecutiveStaffRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("site_executive_id", siteExecutiveId);
         List<BusinessSiteExecutiveStaffRelation> list = this.baseMapper.selectList(queryWrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> deptMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         if (list != null && list.size() > 0) {
-            return meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            List<MeterStaff> meterStaffList = meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            meterStaffList.forEach(
+                    meterStaff -> meterStaff.setDeptName(deptMap.get(Long.valueOf(meterStaff.getDeptId())))
+                    );
+            return meterStaffList;
         }
         return null;
     }
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 81a4204..4858271 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
@@ -198,7 +198,7 @@
     }
 
     @Override
-    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request) throws Exception {
+    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.listPageBySubpackageCertificate(page, request));
         for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(multiItemSampleResponse);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index bdb57c7..def45bb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -27,12 +27,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
+import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
 import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper;
 import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.meter.IMeterOrganizeService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -47,10 +52,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -84,6 +87,8 @@
 
     @Resource
     private IBaseExportService iBaseExportService;
+    @Autowired
+    private IDeptService deptService;
 
     /**
      * 分页查询
@@ -153,8 +158,8 @@
         // 插入文件列表
         batchSaveFile(meterFixedAssets);
         // 新增状态变更记录表
-        EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(null,meterFixedAssets.getId(),meterFixedAssets.getManagerState(), DateUtils.format(new Date()),null,meterFixedAssets.getCreateUser());
-        if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+        EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(null, meterFixedAssets.getId(), meterFixedAssets.getManagerState(), DateUtils.format(new Date()), null, meterFixedAssets.getCreateUser());
+        if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success(meterFixedAssets.getId());
@@ -189,7 +194,7 @@
     }
 
     private void validManufacturingNo(EquipmentFixedAssets item) {
-        if(StringUtils.isNotEmpty(item.getManufacturingNo())) {
+        if (StringUtils.isNotEmpty(item.getManufacturingNo())) {
             QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
             wrapper.eq("manufacturing_no", item.getManufacturingNo());
             wrapper.eq("is_del", 0);
@@ -350,7 +355,15 @@
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.in("id", ids);
         wrapper.eq("is_del", MeterDictEnum.DELETE_FALSE);
-        return this.baseMapper.selectList(wrapper);
+        List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> meterOrganizeMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+        for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
+            equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
+            equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept())));
+        }
+        return equipmentFixedAssetsList;
     }
 
     @Override
@@ -358,7 +371,7 @@
         List<EquipmentUseLog> logList = equipmentUseLogMapper.queryUseLogList(id);
         for (EquipmentUseLog equipmentUseLog : logList) {
             DictCodeUtils.convertDictCodeToName(equipmentUseLog);
-            if(!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())){
+            if (!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())) {
                 equipmentUseLog.setEndDate("至今");
             }
         }
@@ -370,7 +383,7 @@
         List<EquipmentStateChangeLog> logList = stateChangeLogMapper.queryStateChangeLogList(id);
         for (EquipmentStateChangeLog stateChangeLog : logList) {
             DictCodeUtils.convertDictCodeToName(stateChangeLog);
-            if(!StringUtils.isNotEmpty(stateChangeLog.getEndDate())){
+            if (!StringUtils.isNotEmpty(stateChangeLog.getEndDate())) {
                 stateChangeLog.setEndDate("至今");
             }
         }
@@ -406,17 +419,17 @@
     @Override
     public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentRemindExport> resultList;
-        if(!CollectionUtils.isEmpty(request.getIds())){
+        if (!CollectionUtils.isEmpty(request.getIds())) {
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             resultList = meterFixedAssetsMapper.remindList(fixedAssetRequest);
-        }else{
+        } else {
             resultList = meterFixedAssetsMapper.remindList(request);
         }
-        for (EquipmentRemindExport item: resultList) {
+        for (EquipmentRemindExport item : resultList) {
             DictCodeUtils.convertDictCodeToName(item);
         }
-        iBaseExportService.exportExcel(response, EquipmentRemindExport.class,resultList, ExportEnum.EQUIPMENT_REMIND.getSheetName());
+        iBaseExportService.exportExcel(response, EquipmentRemindExport.class, resultList, ExportEnum.EQUIPMENT_REMIND.getSheetName());
     }
 
     @Override
@@ -427,7 +440,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 6ea28a6..ed478a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessOrderService;
@@ -90,7 +91,6 @@
             DictCodeUtils.convertDictCodeToName(response);
         }
         return responseList;
-
     }
 
     @Override
@@ -203,10 +203,11 @@
     }
 
     @Override
-    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) {
+    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception {
         BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail();
         BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id);
         if (siteExecutiveInfo != null) {
+
             //查询是否有关联的检测人员
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
@@ -218,6 +219,9 @@
         businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class);
         BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId());
         populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder);
+        for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         return businessSiteExecutiveDetail;
     }
 
@@ -282,17 +286,12 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                //提前合并，分页统一处理
+                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
-                List<SiteExecutiveApprovalListResponse> rejectApprovalList = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED_REJECT);
-                }
-                //合并未通过-拒绝和未通过-驳回
-                approvalList.addAll(rejectApprovalList);
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index ad1cc40..3aaaf07 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -6,12 +6,16 @@
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -28,6 +32,10 @@
     @Resource
     private MeterStaffMapper meterStaffMapper;
 
+    @Autowired
+    private IDeptService deptService;
+
+
     @Override
     public boolean saveBatch(Long siteExecutiveId, List<MeterStaff> meterStaffList) {
         //先删除所有的绑定关系
@@ -48,8 +56,15 @@
         QueryWrapper<BusinessSiteExecutiveStaffRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("site_executive_id", siteExecutiveId);
         List<BusinessSiteExecutiveStaffRelation> list = this.baseMapper.selectList(queryWrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> deptMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         if (list != null && list.size() > 0) {
-            return meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            List<MeterStaff> meterStaffList = meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            meterStaffList.forEach(
+                    meterStaff -> meterStaff.setDeptName(deptMap.get(Long.valueOf(meterStaff.getDeptId())))
+                    );
+            return meterStaffList;
         }
         return null;
     }
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 81a4204..4858271 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
@@ -198,7 +198,7 @@
     }
 
     @Override
-    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request) throws Exception {
+    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.listPageBySubpackageCertificate(page, request));
         for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(multiItemSampleResponse);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index bdb57c7..def45bb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -27,12 +27,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
+import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
 import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper;
 import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.meter.IMeterOrganizeService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -47,10 +52,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -84,6 +87,8 @@
 
     @Resource
     private IBaseExportService iBaseExportService;
+    @Autowired
+    private IDeptService deptService;
 
     /**
      * 分页查询
@@ -153,8 +158,8 @@
         // 插入文件列表
         batchSaveFile(meterFixedAssets);
         // 新增状态变更记录表
-        EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(null,meterFixedAssets.getId(),meterFixedAssets.getManagerState(), DateUtils.format(new Date()),null,meterFixedAssets.getCreateUser());
-        if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+        EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(null, meterFixedAssets.getId(), meterFixedAssets.getManagerState(), DateUtils.format(new Date()), null, meterFixedAssets.getCreateUser());
+        if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success(meterFixedAssets.getId());
@@ -189,7 +194,7 @@
     }
 
     private void validManufacturingNo(EquipmentFixedAssets item) {
-        if(StringUtils.isNotEmpty(item.getManufacturingNo())) {
+        if (StringUtils.isNotEmpty(item.getManufacturingNo())) {
             QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
             wrapper.eq("manufacturing_no", item.getManufacturingNo());
             wrapper.eq("is_del", 0);
@@ -350,7 +355,15 @@
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.in("id", ids);
         wrapper.eq("is_del", MeterDictEnum.DELETE_FALSE);
-        return this.baseMapper.selectList(wrapper);
+        List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> meterOrganizeMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+        for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
+            equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
+            equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept())));
+        }
+        return equipmentFixedAssetsList;
     }
 
     @Override
@@ -358,7 +371,7 @@
         List<EquipmentUseLog> logList = equipmentUseLogMapper.queryUseLogList(id);
         for (EquipmentUseLog equipmentUseLog : logList) {
             DictCodeUtils.convertDictCodeToName(equipmentUseLog);
-            if(!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())){
+            if (!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())) {
                 equipmentUseLog.setEndDate("至今");
             }
         }
@@ -370,7 +383,7 @@
         List<EquipmentStateChangeLog> logList = stateChangeLogMapper.queryStateChangeLogList(id);
         for (EquipmentStateChangeLog stateChangeLog : logList) {
             DictCodeUtils.convertDictCodeToName(stateChangeLog);
-            if(!StringUtils.isNotEmpty(stateChangeLog.getEndDate())){
+            if (!StringUtils.isNotEmpty(stateChangeLog.getEndDate())) {
                 stateChangeLog.setEndDate("至今");
             }
         }
@@ -406,17 +419,17 @@
     @Override
     public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentRemindExport> resultList;
-        if(!CollectionUtils.isEmpty(request.getIds())){
+        if (!CollectionUtils.isEmpty(request.getIds())) {
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             resultList = meterFixedAssetsMapper.remindList(fixedAssetRequest);
-        }else{
+        } else {
             resultList = meterFixedAssetsMapper.remindList(request);
         }
-        for (EquipmentRemindExport item: resultList) {
+        for (EquipmentRemindExport item : resultList) {
             DictCodeUtils.convertDictCodeToName(item);
         }
-        iBaseExportService.exportExcel(response, EquipmentRemindExport.class,resultList, ExportEnum.EQUIPMENT_REMIND.getSheetName());
+        iBaseExportService.exportExcel(response, EquipmentRemindExport.class, resultList, ExportEnum.EQUIPMENT_REMIND.getSheetName());
     }
 
     @Override
@@ -427,7 +440,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java
index db64199..8dca08d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java
@@ -36,6 +36,6 @@
 
     ReturnDTO draftUpdate(BusinessSiteExecutiveInfo siteExecutiveInfo);
 
-    BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id);
+    BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) throws Exception;
 
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
index ad116bc..a527b9a 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java
@@ -127,7 +127,7 @@
     @ApiOperation("现场检测详情")
     @PostMapping("/detail")
     @ResponseBody
-    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO) {
+    public ReturnDTO<BusinessSiteExecutiveDetail> supplierDetail(@RequestBody @Valid IdDTO idDTO)throws Exception {
         Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
index 9f22064..62a43f0 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerSampleController.java
@@ -129,7 +129,7 @@
 
     @ApiOperation("样品列表（分包证书页面）")
     @PostMapping("/listPageBySubpackageCertificate")
-    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid SubpackageSampleListRequest request, BindingResult bindingResult) throws Exception {
+    public ReturnDTO<PageInfoBT<MultiItemSampleListResponse>> listPageBySubpackageCertificate(@RequestBody @Valid InterchangeSampleListRequest request, BindingResult bindingResult) throws Exception {
         if (bindingResult.hasErrors()) {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
index 8fa9927..b91ac52 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java
@@ -10,6 +10,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
index 9da2639..1839f72 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveEquipmentRelationMapper.java
@@ -12,5 +12,4 @@
  * @since 2023-03-23
  */
 public interface BusinessSiteExecutiveEquipmentRelationMapper extends BaseMapper<BusinessSiteExecutiveEquipmentRelation> {
-
 }
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
index 250d594..781b708 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java
@@ -30,7 +30,7 @@
 
     List<MultiItemSampleListResponse> listPageBySubpackage(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
 
-    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") SubpackageSampleListRequest request);
+    List<MultiItemSampleListResponse> listPageBySubpackageCertificate(@Param("page") Page<MultiItemSampleListResponse> page, @Param("request") InterchangeSampleListRequest request);
 
 
 
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
index 246af44..d54a559 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveInfoMapper.xml
@@ -34,9 +34,13 @@
         FROM business_site_executive_info
         JOIN (
             SELECT  id as orderId,customer_name AS customerName,customer_address AS customerAddress,
+                                   customer_name
             customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
             FROM business_order
             where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         AND approval_status = #{request.approvalStatus}
@@ -44,9 +48,6 @@
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
@@ -60,14 +61,14 @@
                     customer_phone AS customerPhone,deliverer,deliverer_tel AS delivererTel
            FROM business_order
            where   is_del = 0
+            <if test="request.customerName != null and request.customerName !=''">
+                and customer_name like concat('%',#{request.customerName},'%')
+            </if>
         )bo  ON bo.orderId=order_id
         WHERE is_del = 0
         <if test="request.siteExecutiveNo != null and request.siteExecutiveNo !=''">
             and site_executive_no like concat('%',#{request.siteExecutiveNo},'%')
         </if>
-        <if test="request.customerName != null and request.customerName !=''">
-            and customer_name like concat('%',#{request.customerName},'%')
-        </if>
         <if test="request.directorName != null and request.directorName !=''">
             and director_name like concat('%',#{request.directorName},'%')
         </if>
diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
index f601d91..4a62265 100644
--- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml
@@ -219,4 +219,5 @@
         AND manager_state != 4
         AND IFNULL( TIMESTAMPDIFF( MONTH, mesure_date, curdate()), 0 ) >= mesure_cycle - 1
     </select>
+
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
index a7bd1b2..19dc593 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecutiveApprovalListResponse.java
@@ -69,7 +69,7 @@
     private String customerAddress;
 
     @ApiModelProperty(value = "委托方联系人", dataType = "String")
-    private String director;
+    private String deliverer;
 
     @ApiModelProperty(value = "委托方电话", dataType = "String")
     private String customerPhone;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
index 6ea28a6..ed478a2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java
@@ -26,6 +26,7 @@
 import com.casic.missiles.model.business.BusinessOrder;
 import com.casic.missiles.model.business.BusinessSiteExecutiveInfo;
 import com.casic.missiles.model.customer.CustomerInfo;
+import com.casic.missiles.model.equipment.EquipmentFixedAssets;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.service.IBaseApprovalService;
 import com.casic.missiles.service.business.IBusinessOrderService;
@@ -90,7 +91,6 @@
             DictCodeUtils.convertDictCodeToName(response);
         }
         return responseList;
-
     }
 
     @Override
@@ -203,10 +203,11 @@
     }
 
     @Override
-    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) {
+    public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception {
         BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail();
         BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id);
         if (siteExecutiveInfo != null) {
+
             //查询是否有关联的检测人员
             siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id));
             //查询是否有关联的监测设备
@@ -218,6 +219,9 @@
         businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class);
         BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId());
         populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder);
+        for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) {
+            DictCodeUtils.convertDictCodeToName(equipmentFixedAssets);
+        }
         return businessSiteExecutiveDetail;
     }
 
@@ -282,17 +286,12 @@
             case ApprovalStatusEnum.FAILED:
                 businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝
                 List<String> rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回
+                //提前合并，分页统一处理
+                businessKeys.addAll(rejectBusinessKey);
                 if (!CollectionUtils.isEmpty(businessKeys)) {
                     approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, businessKeys);
                     approvalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED);
                 }
-                List<SiteExecutiveApprovalListResponse> rejectApprovalList = new ArrayList<>();
-                if (!CollectionUtils.isEmpty(rejectBusinessKey)) {
-                    approvalList = siteExecutiveInfoMapper.selectBatchForApproval(page, request, rejectBusinessKey);
-                    rejectApprovalList = handleApprovalListResponse(approvalList, ApprovalStatusEnum.FAILED_REJECT);
-                }
-                //合并未通过-拒绝和未通过-驳回
-                approvalList.addAll(rejectApprovalList);
                 break;
             //已取消，该状态维护在flowable
             case ApprovalStatusEnum.CANCELED:
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
index ad1cc40..3aaaf07 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java
@@ -6,12 +6,16 @@
 import com.casic.missiles.mapper.meter.MeterStaffMapper;
 import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation;
 import com.casic.missiles.model.meter.MeterStaff;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -28,6 +32,10 @@
     @Resource
     private MeterStaffMapper meterStaffMapper;
 
+    @Autowired
+    private IDeptService deptService;
+
+
     @Override
     public boolean saveBatch(Long siteExecutiveId, List<MeterStaff> meterStaffList) {
         //先删除所有的绑定关系
@@ -48,8 +56,15 @@
         QueryWrapper<BusinessSiteExecutiveStaffRelation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("site_executive_id", siteExecutiveId);
         List<BusinessSiteExecutiveStaffRelation> list = this.baseMapper.selectList(queryWrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> deptMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId, Dept::getSimpleName));
         if (list != null && list.size() > 0) {
-            return meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            List<MeterStaff> meterStaffList = meterStaffMapper.selectBatchIds(list.stream().map(BusinessSiteExecutiveStaffRelation::getStaffId).collect(Collectors.toList()));
+            meterStaffList.forEach(
+                    meterStaff -> meterStaff.setDeptName(deptMap.get(Long.valueOf(meterStaff.getDeptId())))
+                    );
+            return meterStaffList;
         }
         return null;
     }
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 81a4204..4858271 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
@@ -198,7 +198,7 @@
     }
 
     @Override
-    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request) throws Exception {
+    public Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request) throws Exception {
         page.setRecords(this.baseMapper.listPageBySubpackageCertificate(page, request));
         for (MultiItemSampleListResponse multiItemSampleResponse : page.getRecords()) {
             DictCodeUtils.convertDictCodeToName(multiItemSampleResponse);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
index bdb57c7..def45bb 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java
@@ -27,12 +27,17 @@
 import com.casic.missiles.mapper.equipment.EquipmentFixedAssetFileMapper;
 import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper;
 import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper;
+import com.casic.missiles.mapper.meter.MeterOrganizeMapper;
 import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper;
 import com.casic.missiles.model.equipment.*;
+import com.casic.missiles.model.meter.MeterOrganize;
 import com.casic.missiles.model.page.PageQuery;
 import com.casic.missiles.model.workbench.WorkbenchRemindMessage;
+import com.casic.missiles.modular.system.model.Dept;
+import com.casic.missiles.modular.system.service.IDeptService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetFileService;
 import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService;
+import com.casic.missiles.service.meter.IMeterOrganizeService;
 import com.casic.missiles.utils.DictCodeUtils;
 import com.casic.missiles.utils.NumberGeneratorUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -47,10 +52,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -84,6 +87,8 @@
 
     @Resource
     private IBaseExportService iBaseExportService;
+    @Autowired
+    private IDeptService deptService;
 
     /**
      * 分页查询
@@ -153,8 +158,8 @@
         // 插入文件列表
         batchSaveFile(meterFixedAssets);
         // 新增状态变更记录表
-        EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(null,meterFixedAssets.getId(),meterFixedAssets.getManagerState(), DateUtils.format(new Date()),null,meterFixedAssets.getCreateUser());
-        if(stateChangeLogMapper.insert(stateChangeLog)<=0){
+        EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(null, meterFixedAssets.getId(), meterFixedAssets.getManagerState(), DateUtils.format(new Date()), null, meterFixedAssets.getCreateUser());
+        if (stateChangeLogMapper.insert(stateChangeLog) <= 0) {
             throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
         }
         return ReturnUtil.success(meterFixedAssets.getId());
@@ -189,7 +194,7 @@
     }
 
     private void validManufacturingNo(EquipmentFixedAssets item) {
-        if(StringUtils.isNotEmpty(item.getManufacturingNo())) {
+        if (StringUtils.isNotEmpty(item.getManufacturingNo())) {
             QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
             wrapper.eq("manufacturing_no", item.getManufacturingNo());
             wrapper.eq("is_del", 0);
@@ -350,7 +355,15 @@
         QueryWrapper<EquipmentFixedAssets> wrapper = new QueryWrapper<>();
         wrapper.in("id", ids);
         wrapper.eq("is_del", MeterDictEnum.DELETE_FALSE);
-        return this.baseMapper.selectList(wrapper);
+        List<EquipmentFixedAssets> equipmentFixedAssetsList = this.baseMapper.selectList(wrapper);
+        List<Dept> deptList = deptService.list();
+        Map<Long, String> meterOrganizeMap = deptList.stream()
+                .collect(Collectors.toMap(Dept::getId,Dept::getSimpleName));
+        for (EquipmentFixedAssets equipmentFixedAssets : equipmentFixedAssetsList) {
+            equipmentFixedAssets.setUseDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getUseDept())));
+            equipmentFixedAssets.setMesureDeptName(meterOrganizeMap.get(Long.valueOf(equipmentFixedAssets.getMesureDept())));
+        }
+        return equipmentFixedAssetsList;
     }
 
     @Override
@@ -358,7 +371,7 @@
         List<EquipmentUseLog> logList = equipmentUseLogMapper.queryUseLogList(id);
         for (EquipmentUseLog equipmentUseLog : logList) {
             DictCodeUtils.convertDictCodeToName(equipmentUseLog);
-            if(!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())){
+            if (!StringUtils.isNotEmpty(equipmentUseLog.getEndDate())) {
                 equipmentUseLog.setEndDate("至今");
             }
         }
@@ -370,7 +383,7 @@
         List<EquipmentStateChangeLog> logList = stateChangeLogMapper.queryStateChangeLogList(id);
         for (EquipmentStateChangeLog stateChangeLog : logList) {
             DictCodeUtils.convertDictCodeToName(stateChangeLog);
-            if(!StringUtils.isNotEmpty(stateChangeLog.getEndDate())){
+            if (!StringUtils.isNotEmpty(stateChangeLog.getEndDate())) {
                 stateChangeLog.setEndDate("至今");
             }
         }
@@ -406,17 +419,17 @@
     @Override
     public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception {
         List<EquipmentRemindExport> resultList;
-        if(!CollectionUtils.isEmpty(request.getIds())){
+        if (!CollectionUtils.isEmpty(request.getIds())) {
             FixedAssetRequest fixedAssetRequest = new FixedAssetRequest();
             fixedAssetRequest.setIds(request.getIds());
             resultList = meterFixedAssetsMapper.remindList(fixedAssetRequest);
-        }else{
+        } else {
             resultList = meterFixedAssetsMapper.remindList(request);
         }
-        for (EquipmentRemindExport item: resultList) {
+        for (EquipmentRemindExport item : resultList) {
             DictCodeUtils.convertDictCodeToName(item);
         }
-        iBaseExportService.exportExcel(response, EquipmentRemindExport.class,resultList, ExportEnum.EQUIPMENT_REMIND.getSheetName());
+        iBaseExportService.exportExcel(response, EquipmentRemindExport.class, resultList, ExportEnum.EQUIPMENT_REMIND.getSheetName());
     }
 
     @Override
@@ -427,7 +440,7 @@
         });
         EquipmentFixedAssets fixedAssets = meterFixedAssetsMapper.selectById(idDTO.getId());
         if (fixedAssets != null) {
-            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(),fixedAssets.getUseDept(),idDTO.getId(),fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),MessageTypeEnum.MEASURING_EQUIPMENT.getValue(),fixedAssets.getEquipmentName(),0,user.getId(),user.getName());
+            WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(fixedAssets.getUsePerson(), fixedAssets.getUseDept(), idDTO.getId(), fixedAssets.getAssetNo(), MessageTypeEnum.MEASURING_EQUIPMENT.getCode(), MessageSourceModuleEnum.EQUIPMENT.getCode(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), MessageTypeEnum.MEASURING_EQUIPMENT.getValue(), fixedAssets.getEquipmentName(), 0, user.getId(), user.getName());
             if (messageMapper.insert(remindMessage) > 0) {
                 return ReturnUtil.success();
             }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java
index db64199..8dca08d 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoService.java
@@ -36,6 +36,6 @@
 
     ReturnDTO draftUpdate(BusinessSiteExecutiveInfo siteExecutiveInfo);
 
-    BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id);
+    BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) throws Exception;
 
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java
index 931bc9c..e53879a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/customer/CustomerSampleService.java
@@ -35,7 +35,7 @@
 
     Page<MultiItemSampleListResponse> listPageBySubpackage(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request)  throws Exception;
 
-    Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, SubpackageSampleListRequest request)  throws Exception;
+    Page<MultiItemSampleListResponse> listPageBySubpackageCertificate(Page<MultiItemSampleListResponse> page, InterchangeSampleListRequest request)  throws Exception;
 
     /**
      * 根据 委托书id、样品编号、样品名称查询样品信息（分页）