diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index d6bb339..81287e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -48,7 +48,7 @@
  * 业务管理-委托书 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @Service

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index d6bb339..81287e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -48,7 +48,7 @@
  * 业务管理-委托书 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index c2e8995..5671f16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.druid.sql.repository.SchemaResolveVisitor;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +31,7 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -130,9 +132,11 @@
      * 根据sampleId，orderId,进行状态更新
      */
     @Override
+    @Transactional
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
+        boolean beforeEventFlag = beforeStatusChange(deviceStatusChangeDTO);
         Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false);
-        if (updateFlag > 0) {
+        if (updateFlag > 0 && beforeEventFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -286,4 +290,24 @@
         return false;
     }
 
+    private boolean beforeStatusChange(DeviceStatusChangeDTO statusChangeDTO) {
+        if (statusChangeDTO.getStatus().equals(TO_INCOME)) {
+            QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("order_id", statusChangeDTO.getOrderId());
+            queryWrapper.eq("sample_id", statusChangeDTO.getSampleId());
+            List<BusinessOrderSampleRelation> orderSampleRelationList = this.orderSampleRelationMapper.selectList(queryWrapper);
+            Optional<BusinessOrderSampleRelation> orderSampleRelationOptional = orderSampleRelationList.stream().findFirst();
+            if (orderSampleRelationOptional.isPresent()) {
+                BusinessOrderSampleRelation businessOrderSampleRelation = orderSampleRelationOptional.get();
+                if (businessOrderSampleRelation.getSampleStatus().equals(TO_ALLOCATE)) {
+                    BusinessOrderSampleRelation businessOrderSample = new BusinessOrderSampleRelation();
+                    businessOrderSample.setRealDeliverTime(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    int updateFlag = this.orderSampleRelationMapper.update(businessOrderSample, queryWrapper);
+                    return updateFlag > 0 ? true : false;
+                }
+            }
+        }
+        return true;
+    }
+
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index d6bb339..81287e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -48,7 +48,7 @@
  * 业务管理-委托书 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index c2e8995..5671f16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.druid.sql.repository.SchemaResolveVisitor;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +31,7 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -130,9 +132,11 @@
      * 根据sampleId，orderId,进行状态更新
      */
     @Override
+    @Transactional
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
+        boolean beforeEventFlag = beforeStatusChange(deviceStatusChangeDTO);
         Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false);
-        if (updateFlag > 0) {
+        if (updateFlag > 0 && beforeEventFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -286,4 +290,24 @@
         return false;
     }
 
+    private boolean beforeStatusChange(DeviceStatusChangeDTO statusChangeDTO) {
+        if (statusChangeDTO.getStatus().equals(TO_INCOME)) {
+            QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("order_id", statusChangeDTO.getOrderId());
+            queryWrapper.eq("sample_id", statusChangeDTO.getSampleId());
+            List<BusinessOrderSampleRelation> orderSampleRelationList = this.orderSampleRelationMapper.selectList(queryWrapper);
+            Optional<BusinessOrderSampleRelation> orderSampleRelationOptional = orderSampleRelationList.stream().findFirst();
+            if (orderSampleRelationOptional.isPresent()) {
+                BusinessOrderSampleRelation businessOrderSampleRelation = orderSampleRelationOptional.get();
+                if (businessOrderSampleRelation.getSampleStatus().equals(TO_ALLOCATE)) {
+                    BusinessOrderSampleRelation businessOrderSample = new BusinessOrderSampleRelation();
+                    businessOrderSample.setRealDeliverTime(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    int updateFlag = this.orderSampleRelationMapper.update(businessOrderSample, queryWrapper);
+                    return updateFlag > 0 ? true : false;
+                }
+            }
+        }
+        return true;
+    }
+
 }
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 dd299de..c10797e 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
@@ -11,9 +11,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -21,7 +21,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.mapper.customer.CustomerMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
@@ -49,7 +48,6 @@
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
     private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
-    private final CertificationResponseMapper certificationResponseMapper;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
 
     @Override
@@ -59,10 +57,10 @@
         customerSamplePage.getRecords()
                 .forEach(customerSample -> {
                     BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
                         customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
                         customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus());
-                        customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     }
                 });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
@@ -159,18 +157,21 @@
     }
 
     @Override
-    public Page<MeasureRecordsResponse> measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) {
+    public Page<MeasureRecordsResponse> measureRecordsById(CustomerSampleIdRequest customerSampleIdRequest) {
         Page<MeasureRecordsResponse> page = PageFactory.defaultPage();
-        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest);
+        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsById(page, customerSampleIdRequest);
         return measureRecordsResponsePage;
     }
 
     @Override
-    public Page<CertificationResponse> certificationBySampleId(Long id) {
+    public Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
         Page<CertificationResponse> page = PageFactory.defaultPage();
-        QueryWrapper<CertificationResponse> wrapper = new QueryWrapper<CertificationResponse>()
-                .eq("sample_id", id);
-        Page<CertificationResponse> certificateResponsePage = certificationResponseMapper.selectPage(page, wrapper);
+        Page<CertificationResponse> certificateResponsePage = this.baseMapper.certificateRecordsById(page, customerSampleIdRequest);
+        for (CertificationResponse customerSampleListResponse: certificateResponsePage.getRecords()) {
+            if (!StringUtils.isEmpty(customerSampleListResponse.getCertificationClass())) {
+                DictCodeUtils.convertDictMultiCodeToName(customerSampleListResponse);
+            }
+        }
         return certificateResponsePage;
     }
 
@@ -188,6 +189,9 @@
         return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
+    /**
+     * 初始化样品状态
+     */
     private void initSample(CustomerSampleInfo customerSampleInfo) {
         Long maxNo = this.baseMapper.selectMaxSampleNo();
         String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo);
@@ -207,9 +211,10 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         if (!StringUtils.isEmpty(request.getOvertimeStatus())) {
-            queryWrapper.apply(request.getOvertimeStatus().equals("1"),
+            queryWrapper.apply("1".equals(request.getOvertimeStatus()),
+
                     "sysdate() > DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
-            queryWrapper.apply(request.getOvertimeStatus().equals("0"),
+            queryWrapper.apply("0".equals(request.getOvertimeStatus()),
                     "sysdate() <= DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
         }
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index d6bb339..81287e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -48,7 +48,7 @@
  * 业务管理-委托书 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index c2e8995..5671f16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.druid.sql.repository.SchemaResolveVisitor;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +31,7 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -130,9 +132,11 @@
      * 根据sampleId，orderId,进行状态更新
      */
     @Override
+    @Transactional
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
+        boolean beforeEventFlag = beforeStatusChange(deviceStatusChangeDTO);
         Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false);
-        if (updateFlag > 0) {
+        if (updateFlag > 0 && beforeEventFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -286,4 +290,24 @@
         return false;
     }
 
+    private boolean beforeStatusChange(DeviceStatusChangeDTO statusChangeDTO) {
+        if (statusChangeDTO.getStatus().equals(TO_INCOME)) {
+            QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("order_id", statusChangeDTO.getOrderId());
+            queryWrapper.eq("sample_id", statusChangeDTO.getSampleId());
+            List<BusinessOrderSampleRelation> orderSampleRelationList = this.orderSampleRelationMapper.selectList(queryWrapper);
+            Optional<BusinessOrderSampleRelation> orderSampleRelationOptional = orderSampleRelationList.stream().findFirst();
+            if (orderSampleRelationOptional.isPresent()) {
+                BusinessOrderSampleRelation businessOrderSampleRelation = orderSampleRelationOptional.get();
+                if (businessOrderSampleRelation.getSampleStatus().equals(TO_ALLOCATE)) {
+                    BusinessOrderSampleRelation businessOrderSample = new BusinessOrderSampleRelation();
+                    businessOrderSample.setRealDeliverTime(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    int updateFlag = this.orderSampleRelationMapper.update(businessOrderSample, queryWrapper);
+                    return updateFlag > 0 ? true : false;
+                }
+            }
+        }
+        return true;
+    }
+
 }
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 dd299de..c10797e 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
@@ -11,9 +11,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -21,7 +21,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.mapper.customer.CustomerMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
@@ -49,7 +48,6 @@
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
     private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
-    private final CertificationResponseMapper certificationResponseMapper;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
 
     @Override
@@ -59,10 +57,10 @@
         customerSamplePage.getRecords()
                 .forEach(customerSample -> {
                     BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
                         customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
                         customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus());
-                        customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     }
                 });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
@@ -159,18 +157,21 @@
     }
 
     @Override
-    public Page<MeasureRecordsResponse> measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) {
+    public Page<MeasureRecordsResponse> measureRecordsById(CustomerSampleIdRequest customerSampleIdRequest) {
         Page<MeasureRecordsResponse> page = PageFactory.defaultPage();
-        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest);
+        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsById(page, customerSampleIdRequest);
         return measureRecordsResponsePage;
     }
 
     @Override
-    public Page<CertificationResponse> certificationBySampleId(Long id) {
+    public Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
         Page<CertificationResponse> page = PageFactory.defaultPage();
-        QueryWrapper<CertificationResponse> wrapper = new QueryWrapper<CertificationResponse>()
-                .eq("sample_id", id);
-        Page<CertificationResponse> certificateResponsePage = certificationResponseMapper.selectPage(page, wrapper);
+        Page<CertificationResponse> certificateResponsePage = this.baseMapper.certificateRecordsById(page, customerSampleIdRequest);
+        for (CertificationResponse customerSampleListResponse: certificateResponsePage.getRecords()) {
+            if (!StringUtils.isEmpty(customerSampleListResponse.getCertificationClass())) {
+                DictCodeUtils.convertDictMultiCodeToName(customerSampleListResponse);
+            }
+        }
         return certificateResponsePage;
     }
 
@@ -188,6 +189,9 @@
         return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
+    /**
+     * 初始化样品状态
+     */
     private void initSample(CustomerSampleInfo customerSampleInfo) {
         Long maxNo = this.baseMapper.selectMaxSampleNo();
         String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo);
@@ -207,9 +211,10 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         if (!StringUtils.isEmpty(request.getOvertimeStatus())) {
-            queryWrapper.apply(request.getOvertimeStatus().equals("1"),
+            queryWrapper.apply("1".equals(request.getOvertimeStatus()),
+
                     "sysdate() > DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
-            queryWrapper.apply(request.getOvertimeStatus().equals("0"),
+            queryWrapper.apply("0".equals(request.getOvertimeStatus()),
                     "sysdate() <= DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
         }
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index c418752..f6e1f8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.CustomerUserMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -42,7 +41,6 @@
 
     private final SampleRecordsResponseMapper sampleRecordsResponseMapper;
     private final CustomerUserMapper customerUserMapper;
-    private final CertificationResponseMapper certificationMapper;
     private final IBaseExportService iBaseExportService;
     private final CustomerInfoResponseMapper customerInfoResponseMapper;
 
@@ -154,7 +152,7 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
-        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize());
+        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "business_size", request.getBusinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.eq("is_del", 0);
         return queryWrapper;

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index d6bb339..81287e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -48,7 +48,7 @@
  * 业务管理-委托书 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index c2e8995..5671f16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.druid.sql.repository.SchemaResolveVisitor;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +31,7 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -130,9 +132,11 @@
      * 根据sampleId，orderId,进行状态更新
      */
     @Override
+    @Transactional
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
+        boolean beforeEventFlag = beforeStatusChange(deviceStatusChangeDTO);
         Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false);
-        if (updateFlag > 0) {
+        if (updateFlag > 0 && beforeEventFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -286,4 +290,24 @@
         return false;
     }
 
+    private boolean beforeStatusChange(DeviceStatusChangeDTO statusChangeDTO) {
+        if (statusChangeDTO.getStatus().equals(TO_INCOME)) {
+            QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("order_id", statusChangeDTO.getOrderId());
+            queryWrapper.eq("sample_id", statusChangeDTO.getSampleId());
+            List<BusinessOrderSampleRelation> orderSampleRelationList = this.orderSampleRelationMapper.selectList(queryWrapper);
+            Optional<BusinessOrderSampleRelation> orderSampleRelationOptional = orderSampleRelationList.stream().findFirst();
+            if (orderSampleRelationOptional.isPresent()) {
+                BusinessOrderSampleRelation businessOrderSampleRelation = orderSampleRelationOptional.get();
+                if (businessOrderSampleRelation.getSampleStatus().equals(TO_ALLOCATE)) {
+                    BusinessOrderSampleRelation businessOrderSample = new BusinessOrderSampleRelation();
+                    businessOrderSample.setRealDeliverTime(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    int updateFlag = this.orderSampleRelationMapper.update(businessOrderSample, queryWrapper);
+                    return updateFlag > 0 ? true : false;
+                }
+            }
+        }
+        return true;
+    }
+
 }
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 dd299de..c10797e 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
@@ -11,9 +11,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -21,7 +21,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.mapper.customer.CustomerMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
@@ -49,7 +48,6 @@
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
     private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
-    private final CertificationResponseMapper certificationResponseMapper;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
 
     @Override
@@ -59,10 +57,10 @@
         customerSamplePage.getRecords()
                 .forEach(customerSample -> {
                     BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
                         customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
                         customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus());
-                        customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     }
                 });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
@@ -159,18 +157,21 @@
     }
 
     @Override
-    public Page<MeasureRecordsResponse> measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) {
+    public Page<MeasureRecordsResponse> measureRecordsById(CustomerSampleIdRequest customerSampleIdRequest) {
         Page<MeasureRecordsResponse> page = PageFactory.defaultPage();
-        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest);
+        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsById(page, customerSampleIdRequest);
         return measureRecordsResponsePage;
     }
 
     @Override
-    public Page<CertificationResponse> certificationBySampleId(Long id) {
+    public Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
         Page<CertificationResponse> page = PageFactory.defaultPage();
-        QueryWrapper<CertificationResponse> wrapper = new QueryWrapper<CertificationResponse>()
-                .eq("sample_id", id);
-        Page<CertificationResponse> certificateResponsePage = certificationResponseMapper.selectPage(page, wrapper);
+        Page<CertificationResponse> certificateResponsePage = this.baseMapper.certificateRecordsById(page, customerSampleIdRequest);
+        for (CertificationResponse customerSampleListResponse: certificateResponsePage.getRecords()) {
+            if (!StringUtils.isEmpty(customerSampleListResponse.getCertificationClass())) {
+                DictCodeUtils.convertDictMultiCodeToName(customerSampleListResponse);
+            }
+        }
         return certificateResponsePage;
     }
 
@@ -188,6 +189,9 @@
         return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
+    /**
+     * 初始化样品状态
+     */
     private void initSample(CustomerSampleInfo customerSampleInfo) {
         Long maxNo = this.baseMapper.selectMaxSampleNo();
         String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo);
@@ -207,9 +211,10 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         if (!StringUtils.isEmpty(request.getOvertimeStatus())) {
-            queryWrapper.apply(request.getOvertimeStatus().equals("1"),
+            queryWrapper.apply("1".equals(request.getOvertimeStatus()),
+
                     "sysdate() > DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
-            queryWrapper.apply(request.getOvertimeStatus().equals("0"),
+            queryWrapper.apply("0".equals(request.getOvertimeStatus()),
                     "sysdate() <= DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
         }
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index c418752..f6e1f8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.CustomerUserMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -42,7 +41,6 @@
 
     private final SampleRecordsResponseMapper sampleRecordsResponseMapper;
     private final CustomerUserMapper customerUserMapper;
-    private final CertificationResponseMapper certificationMapper;
     private final IBaseExportService iBaseExportService;
     private final CustomerInfoResponseMapper customerInfoResponseMapper;
 
@@ -154,7 +152,7 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
-        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize());
+        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "business_size", request.getBusinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.eq("is_del", 0);
         return queryWrapper;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
index 54e2757..50ca6e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
@@ -14,7 +14,7 @@
  * 业务管理-设备交接单 服务类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 public interface IBusinessInterchangeService extends IService<BusinessInterchange> {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
index e2d588a..481f92e 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java
@@ -33,7 +33,7 @@
  * 业务管理-设备交接单 前端控制器
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @RestController
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
index ae7a28d..4461f67 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/customer/CustomerController.java
@@ -10,6 +10,7 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.Info.*;
+import com.casic.missiles.dto.customer.MeasureRecordsResponse;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -119,13 +120,20 @@
         return ReturnUtil.success(super.packForBT(customerService.certificationByCustomerId(idDTO.getId())));
     }
 
+    @ApiOperation("根据客户id查询检定记录(在样品中实现，可复用)")
+    @PostMapping("/fake/interface")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsBySampleId() {
+        return null;
+    }
+
     @ApiOperation("客户导出")
     @PostMapping("/export")
-    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response){
+    public void sampleExport(@RequestBody @Valid CustomerListRequest request, HttpServletResponse response) {
         customerService.customerExport(request, response);
     }
 
-        //*******************************************************************************************************************//
+
+    //*******************************************************************************************************************//
 //    @ApiOperation("客户批量导入")
 //    @PostMapping("/batchImport")
 //    public ReturnDTO exportAdvice(@RequestBody @Valid CustomerAdviceInfo customerAdviceInfo, BindingResult bindingResult) {
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 c7d6b3f..101a5d0 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
@@ -10,9 +10,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
@@ -94,20 +94,18 @@
         customerSampleService.sampleExport(request, response);
     }
 
-    @ApiOperation("根据样品id或客户id查询检定记录")
-    @PostMapping("/measureRecordsBySampleId")
-    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> mesureRecordsBySampleId(@RequestBody MeasureRecordsIdRequest recordsIdRequest) {
-        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsBySampleId(recordsIdRequest)));
+    @ApiOperation("根据样品id/客户id查询检定记录")
+    @PostMapping("/measureRecordsById")
+    public ReturnDTO<PageInfoBT<MeasureRecordsResponse>> measureRecordsById(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) {
+        return ReturnUtil.success(super.packForBT(customerSampleService.measureRecordsById(customerSampleIdRequest)));
     }
 
 
-    @ApiOperation("根据样品id查询检定证书")
-    @PostMapping("/certificationBySampleId")
-    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody @Valid IdDTO idDTO) {
-        Assert.isFalse(Objects.isNull(idDTO.getId()), () -> {
-            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
-        });
-        return ReturnUtil.success(super.packForBT(customerSampleService.certificationBySampleId(idDTO.getId())));
+    @ApiOperation("根据样品id/客户id查询检定证书")
+    @PostMapping("/certificateRecordsById")
+    public ReturnDTO<PageInfoBT<CertificationResponse>> certificationBySampleId(@RequestBody CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
+        return ReturnUtil.success(super.packForBT(customerSampleService.certificateRecordsById(customerSampleIdRequest)));
     }
 
+
 }
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
index 91f1072..1aab5c1 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/utils/DictCodeUtils.java
@@ -15,9 +15,9 @@
     /**
      * 字典code转换成名称
      */
-    public static void convertDictCodeToName(Object object) throws Exception{
+    public static void convertDictCodeToName(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields)  {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
@@ -27,7 +27,7 @@
                     throw new BusinessException(500, "缓存名不能为空");
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
-                if(Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())){
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
                     continue;
                 }
                 String name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
@@ -39,7 +39,59 @@
                 if (destField == null) {
                     throw new BusinessException(500, "字典名称字段不存在");
                 }
-                if(!destField.isAccessible()) {
+                if (!destField.isAccessible()) {
+                    destField.setAccessible(true);
+                }
+                destField.set(object, name);
+            }
+        }
+    }
+
+
+    /**
+     * 多个字典code（逗号隔开）,转换成名称
+     */
+    public static void convertDictMultiCodeToName(Object object) throws Exception {
+        Field[] fields = object.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAccessible()) {
+                field.setAccessible(true);
+            }
+            if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null) {
+
+                DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
+                if (StringUtils.isEmpty(dictCodeField.cacheName())) {
+                    throw new BusinessException(500, "缓存名不能为空");
+                }
+                AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
+                if (Objects.isNull(field.get(object)) || StringUtils.isEmpty(field.get(object).toString())) {
+                    continue;
+                }
+                String name = "";
+                //进行字典值得获取
+                if (field.get(object).toString().contains(",")) {
+                    String[] filedObjects = field.get(object).toString().split(",");
+                    for (String filedObject : filedObjects) {
+                        name += dictService.getDictNameByCode(dictCodeField.cacheName(), filedObject) + ",";
+                        if (StringUtils.isEmpty(name)) {
+                            throw new BusinessException(500, dictCodeField.message());
+                        }
+                    }
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                } else {
+                    name = dictService.getDictNameByCode(dictCodeField.cacheName(), field.get(object).toString());
+                    if (StringUtils.isEmpty(name)) {
+                        throw new BusinessException(500, dictCodeField.message());
+                    }
+                }
+                String destFieldName = field.getName() + "Name";
+                Field destField = object.getClass().getDeclaredField(destFieldName);
+                if (destField == null) {
+                    throw new BusinessException(500, "字典名称字段不存在");
+                }
+                if (!destField.isAccessible()) {
                     destField.setAccessible(true);
                 }
                 destField.set(object, name);
@@ -49,19 +101,20 @@
 
     /**
      * 校验字典code是否合法
+     *
      * @param object
      * @return
      */
-    public static boolean validDictCode(Object object) throws Exception{
+    public static boolean validDictCode(Object object) throws Exception {
         Field[] fields = object.getClass().getDeclaredFields();
-        for (Field field:fields) {
+        for (Field field : fields) {
             if (!field.isAccessible()) {
                 field.setAccessible(true);
             }
             if (field.isAnnotationPresent(DictCodeField.class) && field.get(object) != null && !field.get(object).equals("")) {
                 DictCodeField dictCodeField = field.getAnnotationsByType(DictCodeField.class)[0];
                 // 判断字典code是否需要校验
-                if(!dictCodeField.needValid()){
+                if (!dictCodeField.needValid()) {
                     continue;
                 }
                 AbstractDictService dictService = SpringContextUtil.getBean(AbstractDictService.class);
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 8b73201..ebb38b7 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
@@ -2,8 +2,9 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,7 +13,9 @@
     Long selectMaxSampleNo();
 
 
-    Page<MeasureRecordsResponse>  measureRecordsBySampleId(Page<MeasureRecordsResponse> page, @Param("request") MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse>  measureRecordsById(Page<MeasureRecordsResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
+
+    Page<CertificationResponse>  certificateRecordsById(Page<CertificationResponse> page, @Param("request") CustomerSampleIdRequest customerSampleIdRequest);
 
 
     Page<CustomerSampleInfo> samplesByOderId(Page<CustomerSampleInfo> page,
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
deleted file mode 100644
index ed42059..0000000
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/customize/CertificationResponseMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.casic.missiles.mapper.customer.customize;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.casic.missiles.dto.customer.CertificationResponse;
-
-public interface CertificationResponseMapper extends BaseMapper<CertificationResponse> {
-}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
index 3657cfd..5aedb18 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml
@@ -42,10 +42,10 @@
             FROM business_certificate_report
             WHERE is_del = 0
             <if test="request.certificateNo != null and request.certificateNo !=''">
-                and certificate_no like concat('%',#{request.certificateNo},'%')
+                and certificate_report_code like concat('%',#{request.certificateNo},'%')
             </if>
             <if test="request.certificateClass != null and request.certificateClass !=''">
-                and certificate_class like concat('%',#{request.certificateClass},'%')
+                and certificate_report_category like concat('%',#{request.certificateClass},'%')
             </if>
             <if test="request.printStatus != null and request.printStatus !=''">
                 and print_status = #{request.printStatus}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
index a119612..7f75b74 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml
@@ -40,29 +40,28 @@
         SELECT
         bif.id,deliverer,customerNo,customerName,delivererTel,orderId,id,interchangeCode,remark,deliverTime,bo.orderId,isUrgent,orderNo,requireOverTime,reciever
         FROM (
-        SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
-        "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
-        FROM business_interchange
-        WHERE is_del = 0
-        <if test="request.interchangeCode != null and request.interchangeCode !=''">
-            AND interchange_Code=#{request.interchangeCode}
-        </if>
-        <if test="request.reciever != null and request.reciever !=''">
-            AND reciever=#{request.reciever}
-        </if>
-
-        <if test="request.startTime != null and request.startTime !=''">
-            AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.endTime != null and request.endTime !=''">
-            AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
-        </if>
-        <if test="request.ids != null ">
-            and id in
-            <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
-        </if>
+            SELECT id,interchange_code AS "interchangeCode",remark,order_id,deliver_time AS
+            "deliverTime",reciever,deliverer,deliverer_tel AS "delivererTel"
+            FROM business_interchange
+            WHERE is_del = 0
+            <if test="request.interchangeCode != null and request.interchangeCode !=''">
+                AND interchange_Code=#{request.interchangeCode}
+            </if>
+            <if test="request.reciever != null and request.reciever !=''">
+                AND reciever=#{request.reciever}
+            </if>
+            <if test="request.startTime != null and request.startTime !=''">
+                AND #{request.startTime}  <![CDATA[ <= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.endTime != null and request.endTime !=''">
+                AND #{request.endTime}  <![CDATA[ >= ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d')
+            </if>
+            <if test="request.ids != null ">
+                and id in
+                <foreach collection="request.ids" item="id" index="index" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
         ) bif
         JOIN (
         SELECT customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
index cff5fc5..86f4ee4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml
@@ -33,7 +33,7 @@
         SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code,
         bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong,
         bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType",
-        bo.is_urgent AS "isUrgent"
+        bo.is_urgent AS "isUrgent",plan_deliver_time  AS "planDeliverTime"
         FROM
         (
             SELECT *
diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
index e7f5950..893a2ff 100644
--- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml
@@ -7,41 +7,56 @@
         FROM customer_sample_info
     </select>
 
-    <select id="measureRecordsBySampleId" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
+    <select id="measureRecordsById" resultType="com.casic.missiles.dto.customer.MeasureRecordsResponse">
         SELECT order_id AS "orderId",order_code AS "orderCode",order_time AS orderTime,
         customer_no AS customerCode,customer_name AS "customerName",deliverer,real_deliver_time AS "deliverTime"
         FROM
         (
-            SELECT id
-            FROM customer_sample_info csi
-            WHERE csi.is_del =0
-            <if test="request.sampleId != null and request.sampleId !=''">
-                AND csi.id=#{request.sampleId}
-            </if>
-            <if test="request.customerId != null and request.customerId !=''">
-                AND csi.customer_id=#{request.customerId }
-            </if>
+        SELECT id
+        FROM customer_sample_info csi
+        WHERE csi.is_del =0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND csi.id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND csi.customer_id=#{request.customerId }
+        </if>
         )csi
         JOIN
         (
-            SELECT sample_id,order_id,real_deliver_time
-            FROM business_order_sample_relation
-            WHERE 1=1
-            <if test="request.sampleId != null and request.sampleId !=''">
-              AND   sample_id=#{request.sampleId}
-            </if>
+        SELECT sample_id,order_id,real_deliver_time
+        FROM business_order_sample_relation
+        WHERE 1=1
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
         )bosr ON bosr.sample_id=csi.id
         JOIN (
-            SELECT *
-            FROM business_order
-            WHERE is_del =0
-            <if test="request.customerId != null and request.customerId !=''">
-               AND customer_id=#{request.customerId}
-            </if>
+        SELECT *
+        FROM business_order
+        WHERE is_del =0
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId}
+        </if>
         )bo ON bo.id=bosr.order_id
         ORDER BY bosr.real_deliver_time DESC
     </select>
 
+
+    <select id="certificateRecordsById" resultType="com.casic.missiles.dto.customer.CertificationResponse">
+        SELECT id AS "certificationId",certificate_report_code AS "certificationCode",certificate_report_name AS
+        "certificationName", certificate_report_category AS "certificationClass",issuance_date AS "effectiveDate",expiration_date AS "expirationDate"
+        FROM business_certificate_report
+        WHERE is_del=0
+        <if test="request.sampleId != null and request.sampleId !=''">
+            AND sample_id=#{request.sampleId}
+        </if>
+        <if test="request.customerId != null and request.customerId !=''">
+            AND customer_id=#{request.customerId }
+        </if>
+        ORDER BY issuance_date DESC
+    </select>
+
     <select id="samplesByOderId" resultType="com.casic.missiles.model.customer.CustomerSampleInfo">
         SELECT
         csi.*
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
index 3b34857..a4d1002 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java
@@ -111,7 +111,11 @@
     //打印状态
     String PRINT_STATUS = "printStatus";
     //证书类型
-    String CERTIFICATE_TYPE = "certificateType";
+    String CERTIFICATE_TYPE = "certificationType";
+
+    //证书类别
+    String CERTIFICATE_CLASS= "certificationClass";
+
     //证书管理-检校专业
     String CALIBRATION_MAJOR= "calibrationMajor";
 
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
index bb96f39..9fc5826 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/order/OrderListReponse.java
@@ -64,6 +64,9 @@
     @ExcelProperty(value = "联系方式",order = 5)
     private String customerPhone;
 
+    @ApiModelProperty(value = "预计送达时间", dataType = "String")
+    private String planDeliverTime;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "样品数量", dataType = "String")
     @ExcelProperty(value = "样品数量",order = 6)
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
index 06ae300..267b9a1 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java
@@ -53,11 +53,11 @@
     private String orderNo;
 
     @ApiModelProperty(value = "校验类别", dataType = "String")
-    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_CATEGORY)
+    @DictCodeField(message = "校验类别不合法", cacheName = MeterDictCode.MEASURE_TYPE)
     private String measureType;
 
     @ApiModelProperty(value = "校验类别名称", dataType = "String")
-    @ExcelProperty(value = "校验类别",order = 7)
+    @ExcelProperty(value = "校验类别名称",order = 7)
     private String measureTypeName;
 
     @ApiModelProperty(value = "检定人员", dataType = "String")
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
index 69a1b4e..9f44f75 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/CertificationResponse.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.casic.missiles.annotation.DictCodeField;
+import com.casic.missiles.constants.MeterDictCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,10 +28,11 @@
     private String certificationName;
 
     @ApiModelProperty(value = "证书类型", dataType = "String")
-    private String certificationType;
+    @DictCodeField(message = "样品状态描述不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS)
+    private String certificationClass;
 
     @ApiModelProperty(value = "证书类型名称", dataType = "String")
-    private String certificationTypeName;
+    private String certificationClassName;
 
     @ApiModelProperty(value = "证书出具日期", dataType = "String")
     private String effectiveDate;
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
new file mode 100644
index 0000000..0afee82
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleIdRequest.java
@@ -0,0 +1,22 @@
+package com.casic.missiles.dto.customer.sample;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+
+@Data
+@ApiModel("检测记录查询id")
+public class CustomerSampleIdRequest {
+
+    @ApiModelProperty("样品Id")
+    private Long  sampleId;
+
+    @ApiModelProperty("客户id")
+    private Long  customerId;
+
+}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
deleted file mode 100644
index 7bcf105..0000000
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MeasureRecordsIdRequest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.casic.missiles.dto.customer.sample;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author cz
- */
-
-@Data
-@ApiModel("检测记录查询id")
-public class MeasureRecordsIdRequest {
-
-    @ApiModelProperty("样品Id")
-    private Long  sampleId;
-
-    @ApiModelProperty("客户id")
-    private Long  customerId;
-
-}
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
new file mode 100644
index 0000000..e196dda
--- /dev/null
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/NotifyEventStatusDTO.java
@@ -0,0 +1,23 @@
+package com.casic.missiles.dto.flowable;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cz
+ */
+@Data
+@Builder
+public class NotifyEventStatusDTO {
+
+    /**
+     *  业务表主键
+     */
+    private String  id;
+    /**
+     *  业务表状态
+     */
+    private String status;
+
+
+}
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
index d6bb339..81287e6 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java
@@ -48,7 +48,7 @@
  * 业务管理-委托书 服务实现类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 @Service
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
index c2e8995..5671f16 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.service.Impl.business;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.druid.sql.repository.SchemaResolveVisitor;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -30,6 +31,7 @@
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -130,9 +132,11 @@
      * 根据sampleId，orderId,进行状态更新
      */
     @Override
+    @Transactional
     public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) {
+        boolean beforeEventFlag = beforeStatusChange(deviceStatusChangeDTO);
         Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false);
-        if (updateFlag > 0) {
+        if (updateFlag > 0 && beforeEventFlag) {
             return ReturnUtil.success();
         }
         throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED);
@@ -286,4 +290,24 @@
         return false;
     }
 
+    private boolean beforeStatusChange(DeviceStatusChangeDTO statusChangeDTO) {
+        if (statusChangeDTO.getStatus().equals(TO_INCOME)) {
+            QueryWrapper<BusinessOrderSampleRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("order_id", statusChangeDTO.getOrderId());
+            queryWrapper.eq("sample_id", statusChangeDTO.getSampleId());
+            List<BusinessOrderSampleRelation> orderSampleRelationList = this.orderSampleRelationMapper.selectList(queryWrapper);
+            Optional<BusinessOrderSampleRelation> orderSampleRelationOptional = orderSampleRelationList.stream().findFirst();
+            if (orderSampleRelationOptional.isPresent()) {
+                BusinessOrderSampleRelation businessOrderSampleRelation = orderSampleRelationOptional.get();
+                if (businessOrderSampleRelation.getSampleStatus().equals(TO_ALLOCATE)) {
+                    BusinessOrderSampleRelation businessOrderSample = new BusinessOrderSampleRelation();
+                    businessOrderSample.setRealDeliverTime(DateUtil.format(new Date(), "yyyy-MM-dd"));
+                    int updateFlag = this.orderSampleRelationMapper.update(businessOrderSample, queryWrapper);
+                    return updateFlag > 0 ? true : false;
+                }
+            }
+        }
+        return true;
+    }
+
 }
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 dd299de..c10797e 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
@@ -11,9 +11,9 @@
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
@@ -21,7 +21,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper;
 import com.casic.missiles.mapper.customer.CustomerMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerSampleListResponseMapper;
 import com.casic.missiles.mapper.customer.CustomerSampleMapper;
 import com.casic.missiles.model.business.BusinessOrderSampleRelation;
@@ -49,7 +48,6 @@
     private final CustomerSampleListResponseMapper customerSampleListResponseMapper;
     private final CustomerMapper customerMapper;
     private final IBaseExportService iBaseExportService;
-    private final CertificationResponseMapper certificationResponseMapper;
     private final BusinessOrderSampleRelationMapper sampleRelationMapper;
 
     @Override
@@ -59,10 +57,10 @@
         customerSamplePage.getRecords()
                 .forEach(customerSample -> {
                     BusinessOrderSampleRelation businessOrderSampleRelation = this.getSampleStatusById(customerSample.getId());
+                    customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) {
                         customerSample.setOrderId(businessOrderSampleRelation.getOrderId());
                         customerSample.setSampleStatus(businessOrderSampleRelation.getSampleStatus());
-                        customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline()));
                     }
                 });
         for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) {
@@ -159,18 +157,21 @@
     }
 
     @Override
-    public Page<MeasureRecordsResponse> measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest) {
+    public Page<MeasureRecordsResponse> measureRecordsById(CustomerSampleIdRequest customerSampleIdRequest) {
         Page<MeasureRecordsResponse> page = PageFactory.defaultPage();
-        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsBySampleId(page, recordsIdRequest);
+        Page<MeasureRecordsResponse> measureRecordsResponsePage = this.baseMapper.measureRecordsById(page, customerSampleIdRequest);
         return measureRecordsResponsePage;
     }
 
     @Override
-    public Page<CertificationResponse> certificationBySampleId(Long id) {
+    public Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception{
         Page<CertificationResponse> page = PageFactory.defaultPage();
-        QueryWrapper<CertificationResponse> wrapper = new QueryWrapper<CertificationResponse>()
-                .eq("sample_id", id);
-        Page<CertificationResponse> certificateResponsePage = certificationResponseMapper.selectPage(page, wrapper);
+        Page<CertificationResponse> certificateResponsePage = this.baseMapper.certificateRecordsById(page, customerSampleIdRequest);
+        for (CertificationResponse customerSampleListResponse: certificateResponsePage.getRecords()) {
+            if (!StringUtils.isEmpty(customerSampleListResponse.getCertificationClass())) {
+                DictCodeUtils.convertDictMultiCodeToName(customerSampleListResponse);
+            }
+        }
         return certificateResponsePage;
     }
 
@@ -188,6 +189,9 @@
         return orderSampleOptional.isPresent() ? orderSampleOptional.get() : null;
     }
 
+    /**
+     * 初始化样品状态
+     */
     private void initSample(CustomerSampleInfo customerSampleInfo) {
         Long maxNo = this.baseMapper.selectMaxSampleNo();
         String sampleNo = NumberGeneratorUtil.getContactNo(SAMPLE_PREFIX, maxNo);
@@ -207,9 +211,10 @@
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         if (!StringUtils.isEmpty(request.getOvertimeStatus())) {
-            queryWrapper.apply(request.getOvertimeStatus().equals("1"),
+            queryWrapper.apply("1".equals(request.getOvertimeStatus()),
+
                     "sysdate() > DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
-            queryWrapper.apply(request.getOvertimeStatus().equals("0"),
+            queryWrapper.apply("0".equals(request.getOvertimeStatus()),
                     "sysdate() <= DATE_FORMAT(valid_deadline,'%Y-%m-%d')");
         }
         queryWrapper.apply(StringUtils.isNotBlank(request.getStartTime()),
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
index c418752..f6e1f8a 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerServiceImpl.java
@@ -17,7 +17,6 @@
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.customer.CustomerMapper;
 import com.casic.missiles.mapper.customer.CustomerUserMapper;
-import com.casic.missiles.mapper.customer.customize.CertificationResponseMapper;
 import com.casic.missiles.mapper.customer.customize.CustomerInfoResponseMapper;
 import com.casic.missiles.mapper.customer.customize.SampleRecordsResponseMapper;
 import com.casic.missiles.model.customer.CustomerInfo;
@@ -42,7 +41,6 @@
 
     private final SampleRecordsResponseMapper sampleRecordsResponseMapper;
     private final CustomerUserMapper customerUserMapper;
-    private final CertificationResponseMapper certificationMapper;
     private final IBaseExportService iBaseExportService;
     private final CustomerInfoResponseMapper customerInfoResponseMapper;
 
@@ -154,7 +152,7 @@
         QueryWrapper<CustomerInfoResponse> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerNo()), "customer_no", request.getCustomerNo());
         queryWrapper.like(StringUtils.isNotBlank(request.getCustomerName()), "customer_name", request.getCustomerName());
-        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "bussiness_size", request.getBusinessSize());
+        queryWrapper.like(StringUtils.isNotBlank(request.getBusinessSize()), "business_size", request.getBusinessSize());
         queryWrapper.like(StringUtils.isNotBlank(request.getGrade()), "grade", request.getGrade());
         queryWrapper.eq("is_del", 0);
         return queryWrapper;
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
index 54e2757..50ca6e2 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessInterchangeService.java
@@ -14,7 +14,7 @@
  * 业务管理-设备交接单 服务类
  * </p>
  *
- * @author wangpeng
+ * @author cz
  * @since 2023-02-02
  */
 public interface IBusinessInterchangeService extends IService<BusinessInterchange> {
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 19f84d3..6c209a8 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
@@ -4,13 +4,16 @@
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.customer.CertificationResponse;
 import com.casic.missiles.dto.customer.MeasureRecordsResponse;
+import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListRequest;
 import com.casic.missiles.dto.customer.sample.CustomerSampleListResponse;
-import com.casic.missiles.dto.customer.sample.MeasureRecordsIdRequest;
 import com.casic.missiles.model.customer.CustomerSampleInfo;
 
 import javax.servlet.http.HttpServletResponse;
 
+/**
+ * @author cz
+ */
 public interface CustomerSampleService {
 
     Page<CustomerSampleListResponse> listPage(Page<CustomerSampleListResponse> page, CustomerSampleListRequest request) throws Exception;
@@ -25,9 +28,9 @@
 
     ReturnDTO deleteSample(Long id);
 
-    Page<MeasureRecordsResponse> measureRecordsBySampleId(MeasureRecordsIdRequest recordsIdRequest);
+    Page<MeasureRecordsResponse> measureRecordsById(CustomerSampleIdRequest customerSampleIdRequest);
 
-    Page<CertificationResponse> certificationBySampleId(Long id);
+    Page<CertificationResponse> certificateRecordsById(CustomerSampleIdRequest customerSampleIdRequest) throws Exception;
 
     /**
      * 根据 委托书id、样品编号、样品名称查询样品信息（分页）